X-Git-Url: https://git.pterodactylus.net/?p=Sone.git;a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fcore%2FCore.java;h=a51a189c9c0fa903d98341008873cf8e522a776c;hp=70982992bf4c86ff83b411d0aae14712f5771762;hb=cb1cac49eee468cf29124601f8822b78e919258b;hpb=4a00f789a5027397e238bf0024aeb1185cf03965

diff --git a/src/main/java/net/pterodactylus/sone/core/Core.java b/src/main/java/net/pterodactylus/sone/core/Core.java
index 7098299..a51a189 100644
--- a/src/main/java/net/pterodactylus/sone/core/Core.java
+++ b/src/main/java/net/pterodactylus/sone/core/Core.java
@@ -42,6 +42,7 @@ import net.pterodactylus.sone.data.PostReply;
 import net.pterodactylus.sone.data.Profile;
 import net.pterodactylus.sone.data.Reply;
 import net.pterodactylus.sone.data.Sone;
+import net.pterodactylus.sone.data.Sone.ShowCustomAvatars;
 import net.pterodactylus.sone.data.TemporaryImage;
 import net.pterodactylus.sone.data.Profile.Field;
 import net.pterodactylus.sone.fcp.FcpInterface;
@@ -998,6 +999,8 @@ public class Core extends AbstractService implements IdentityListener, UpdateLis
 		sone.getOptions().addBooleanOption("ShowNotification/NewSones", new DefaultOption<Boolean>(true));
 		sone.getOptions().addBooleanOption("ShowNotification/NewPosts", new DefaultOption<Boolean>(true));
 		sone.getOptions().addBooleanOption("ShowNotification/NewReplies", new DefaultOption<Boolean>(true));
+		sone.getOptions().addEnumOption("ShowCustomAvatars", new DefaultOption<ShowCustomAvatars>(ShowCustomAvatars.NEVER));
+
 		followSone(sone, getSone("nwa8lHa271k2QvJ8aa0Ov7IHAV-DFOCFgmDt3X6BpCI"));
 		touchConfiguration();
 		return sone;
@@ -1061,7 +1064,7 @@ public class Core extends AbstractService implements IdentityListener, UpdateLis
 	 */
 	public void followSone(Sone sone, String soneId) {
 		Validation.begin().isNotNull("Sone", sone).isNotNull("Sone ID", soneId).check();
-		Sone followedSone = getSone(soneId);
+		Sone followedSone = getSone(soneId, true);
 		if (followedSone == null) {
 			logger.log(Level.INFO, String.format("Ignored Sone with invalid ID: %s", soneId));
 			return;
@@ -1431,6 +1434,7 @@ public class Core extends AbstractService implements IdentityListener, UpdateLis
 		sone.getOptions().addBooleanOption("ShowNotification/NewSones", new DefaultOption<Boolean>(true));
 		sone.getOptions().addBooleanOption("ShowNotification/NewPosts", new DefaultOption<Boolean>(true));
 		sone.getOptions().addBooleanOption("ShowNotification/NewReplies", new DefaultOption<Boolean>(true));
+		sone.getOptions().addEnumOption("ShowCustomAvatars", new DefaultOption<ShowCustomAvatars>(ShowCustomAvatars.NEVER));
 
 		/* load Sone. */
 		String sonePrefix = "Sone/" + sone.getId();
@@ -1442,7 +1446,7 @@ public class Core extends AbstractService implements IdentityListener, UpdateLis
 		String lastInsertFingerprint = configuration.getStringValue(sonePrefix + "/LastInsertFingerprint").getValue("");
 
 		/* load profile. */
-		Profile profile = new Profile();
+		Profile profile = new Profile(sone);
 		profile.setFirstName(configuration.getStringValue(sonePrefix + "/Profile/FirstName").getValue(null));
 		profile.setMiddleName(configuration.getStringValue(sonePrefix + "/Profile/MiddleName").getValue(null));
 		profile.setLastName(configuration.getStringValue(sonePrefix + "/Profile/LastName").getValue(null));
@@ -1590,12 +1594,19 @@ public class Core extends AbstractService implements IdentityListener, UpdateLis
 			album.addImage(image);
 		}
 
+		/* load avatar. */
+		String avatarId = configuration.getStringValue(sonePrefix + "/Profile/Avatar").getValue(null);
+		if (avatarId != null) {
+			profile.setAvatar(getImage(avatarId, false));
+		}
+
 		/* load options. */
 		sone.getOptions().getBooleanOption("AutoFollow").set(configuration.getBooleanValue(sonePrefix + "/Options/AutoFollow").getValue(null));
 		sone.getOptions().getBooleanOption("EnableSoneInsertNotifications").set(configuration.getBooleanValue(sonePrefix + "/Options/EnableSoneInsertNotifications").getValue(null));
 		sone.getOptions().getBooleanOption("ShowNotification/NewSones").set(configuration.getBooleanValue(sonePrefix + "/Options/ShowNotification/NewSones").getValue(null));
 		sone.getOptions().getBooleanOption("ShowNotification/NewPosts").set(configuration.getBooleanValue(sonePrefix + "/Options/ShowNotification/NewPosts").getValue(null));
 		sone.getOptions().getBooleanOption("ShowNotification/NewReplies").set(configuration.getBooleanValue(sonePrefix + "/Options/ShowNotification/NewReplies").getValue(null));
+		sone.getOptions().<ShowCustomAvatars> getEnumOption("ShowCustomAvatars").set(ShowCustomAvatars.valueOf(configuration.getStringValue(sonePrefix + "/Options/ShowCustomAvatars").getValue(ShowCustomAvatars.NEVER.name())));
 
 		/* if we’re still here, Sone was loaded successfully. */
 		synchronized (sone) {
@@ -2135,6 +2146,7 @@ public class Core extends AbstractService implements IdentityListener, UpdateLis
 			configuration.getIntValue(sonePrefix + "/Profile/BirthDay").setValue(profile.getBirthDay());
 			configuration.getIntValue(sonePrefix + "/Profile/BirthMonth").setValue(profile.getBirthMonth());
 			configuration.getIntValue(sonePrefix + "/Profile/BirthYear").setValue(profile.getBirthYear());
+			configuration.getStringValue(sonePrefix + "/Profile/Avatar").setValue(profile.getAvatar());
 
 			/* save profile fields. */
 			int fieldCounter = 0;
@@ -2228,6 +2240,7 @@ public class Core extends AbstractService implements IdentityListener, UpdateLis
 			configuration.getBooleanValue(sonePrefix + "/Options/ShowNotification/NewPosts").setValue(sone.getOptions().getBooleanOption("ShowNotification/NewPosts").getReal());
 			configuration.getBooleanValue(sonePrefix + "/Options/ShowNotification/NewReplies").setValue(sone.getOptions().getBooleanOption("ShowNotification/NewReplies").getReal());
 			configuration.getBooleanValue(sonePrefix + "/Options/EnableSoneInsertNotifications").setValue(sone.getOptions().getBooleanOption("EnableSoneInsertNotifications").getReal());
+			configuration.getStringValue(sonePrefix + "/Options/ShowCustomAvatars").setValue(sone.getOptions().<ShowCustomAvatars> getEnumOption("ShowCustomAvatars").get().name());
 
 			configuration.save();
 
@@ -2414,8 +2427,13 @@ public class Core extends AbstractService implements IdentityListener, UpdateLis
 				break;
 			}
 			long time = configuration.getLongValue("SoneFollowingTimes/" + soneCounter + "/Time").getValue(Long.MAX_VALUE);
-			synchronized (soneFollowingTimes) {
-				soneFollowingTimes.put(getSone(soneId), time);
+			Sone followedSone = getSone(soneId);
+			if (followedSone == null) {
+				logger.log(Level.WARNING, String.format("Ignoring Sone with invalid ID: %s", soneId));
+			} else {
+				synchronized (soneFollowingTimes) {
+					soneFollowingTimes.put(getSone(soneId), time);
+				}
 			}
 			++soneCounter;
 		}