X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;ds=inline;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fdata%2FSone.java;h=777660f937febe485830561ebeece73f5acb9c5b;hb=914d5522692e7714ba5bdefb002fedc8e293f5fc;hp=b23e48e95393e8f6b6f1a5e6a93e8aaaf5633788;hpb=239f08e37721401290f43596e8a7e9aa83aae980;p=Sone.git

diff --git a/src/main/java/net/pterodactylus/sone/data/Sone.java b/src/main/java/net/pterodactylus/sone/data/Sone.java
index b23e48e..777660f 100644
--- a/src/main/java/net/pterodactylus/sone/data/Sone.java
+++ b/src/main/java/net/pterodactylus/sone/data/Sone.java
@@ -1,5 +1,5 @@
 /*
- * Sone - Sone.java - Copyright © 2010–2013 David Roden
+ * Sone - Sone.java - Copyright © 2010–2016 David Roden
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -69,30 +69,6 @@ public interface Sone extends Identified, Fingerprintable, Comparable<Sone> {
 		downloading,
 	}
 
-	/**
-	 * The possible values for the “show custom avatars” option.
-	 *
-	 * @author <a href="mailto:bombe@pterodactylus.net">David ‘Bombe’ Roden</a>
-	 */
-	public static enum ShowCustomAvatars {
-
-		/** Never show custom avatars. */
-		NEVER,
-
-		/** Only show custom avatars of followed Sones. */
-		FOLLOWED,
-
-		/** Only show custom avatars of Sones you manually trust. */
-		MANUALLY_TRUSTED,
-
-		/** Only show custom avatars of automatically trusted Sones. */
-		TRUSTED,
-
-		/** Always show custom avatars. */
-		ALWAYS,
-
-	}
-
 	/** comparator that sorts Sones by their nice name. */
 	public static final Comparator<Sone> NICE_NAME_COMPARATOR = new Comparator<Sone>() {
 
@@ -171,17 +147,6 @@ public interface Sone extends Identified, Fingerprintable, Comparable<Sone> {
 		}
 	};
 
-	public static final Function<Sone, String> toSoneXmlUri =
-			new Function<Sone, String>() {
-				@Nonnull
-				@Override
-				public String apply(@Nullable Sone input) {
-					return input.getRequestUri()
-							.setMetaString(new String[] { "sone.xml" })
-							.toString();
-				}
-			};
-
 	public static final Function<Sone, List<Album>> toAllAlbums = new Function<Sone, List<Album>>() {
 		@Override
 		public List<Album> apply(@Nullable Sone sone) {
@@ -341,7 +306,7 @@ public interface Sone extends Identified, Fingerprintable, Comparable<Sone> {
 	 *
 	 * @return The friend Sones of this Sone
 	 */
-	List<String> getFriends();
+	Collection<String> getFriends();
 
 	/**
 	 * Returns whether this Sone has the given Sone as a friend Sone.
@@ -354,24 +319,6 @@ public interface Sone extends Identified, Fingerprintable, Comparable<Sone> {
 	boolean hasFriend(String friendSoneId);
 
 	/**
-	 * Adds the given Sone as a friend Sone.
-	 *
-	 * @param friendSone
-	 * 		The friend Sone to add
-	 * @return This Sone (for method chaining)
-	 */
-	Sone addFriend(String friendSone);
-
-	/**
-	 * Removes the given Sone as a friend Sone.
-	 *
-	 * @param friendSoneId
-	 * 		The ID of the friend Sone to remove
-	 * @return This Sone (for method chaining)
-	 */
-	Sone removeFriend(String friendSoneId);
-
-	/**
 	 * Returns the list of posts of this Sone, sorted by time, newest first.
 	 *
 	 * @return All posts of this Sone