X-Git-Url: https://git.pterodactylus.net/?p=Sone.git;a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fcore%2FCore.java;h=093761e86fc0894488afe2c2fcb025f6003d9d39;hp=d3f50a1e4fdee6634f541fc8b1cd5df8d5ea0ab6;hb=4469882d9fe877e817b1be116ab2c6ba0d87aa56;hpb=2a3193f488ecff7496d7464e2e2213c82a2708a3

diff --git a/src/main/java/net/pterodactylus/sone/core/Core.java b/src/main/java/net/pterodactylus/sone/core/Core.java
index d3f50a1..093761e 100644
--- a/src/main/java/net/pterodactylus/sone/core/Core.java
+++ b/src/main/java/net/pterodactylus/sone/core/Core.java
@@ -509,17 +509,6 @@ public class Core extends AbstractService implements IdentityListener, UpdateLis
 	 *
 	 * @param id
 	 *            The ID of the remote Sone to get
-	 * @return The Sone with the given ID
-	 */
-	public Sone getRemoteSone(String id) {
-		return getRemoteSone(id, true);
-	}
-
-	/**
-	 * Returns the remote Sone with the given ID.
-	 *
-	 * @param id
-	 *            The ID of the remote Sone to get
 	 * @param create
 	 *            {@code true} to always create a Sone, {@code false} to return
 	 *            {@code null} if no Sone with the given ID exists
@@ -528,7 +517,7 @@ public class Core extends AbstractService implements IdentityListener, UpdateLis
 	public Sone getRemoteSone(String id, boolean create) {
 		synchronized (remoteSones) {
 			Sone sone = remoteSones.get(id);
-			if ((sone == null) && create) {
+			if ((sone == null) && create && (id != null) && (id.length() == 43)) {
 				sone = new Sone(id);
 				remoteSones.put(id, sone);
 				setSoneStatus(sone, SoneStatus.unknown);
@@ -956,29 +945,6 @@ public class Core extends AbstractService implements IdentityListener, UpdateLis
 	}
 
 	/**
-	 * Adds a local Sone from the given ID which has to be the ID of an own
-	 * identity.
-	 *
-	 * @param id
-	 *            The ID of an own identity to add a Sone for
-	 * @return The added (or already existing) Sone
-	 */
-	public Sone addLocalSone(String id) {
-		synchronized (localSones) {
-			if (localSones.containsKey(id)) {
-				logger.log(Level.FINE, "Tried to add known local Sone: %s", id);
-				return localSones.get(id);
-			}
-			OwnIdentity ownIdentity = identityManager.getOwnIdentity(id);
-			if (ownIdentity == null) {
-				logger.log(Level.INFO, "Invalid Sone ID: %s", id);
-				return null;
-			}
-			return addLocalSone(ownIdentity);
-		}
-	}
-
-	/**
 	 * Adds a local Sone from the given own identity.
 	 *
 	 * @param ownIdentity
@@ -1050,7 +1016,7 @@ public class Core extends AbstractService implements IdentityListener, UpdateLis
 			return null;
 		}
 		synchronized (remoteSones) {
-			final Sone sone = getRemoteSone(identity.getId()).setIdentity(identity);
+			final Sone sone = getRemoteSone(identity.getId(), true).setIdentity(identity);
 			boolean newSone = sone.getRequestUri() == null;
 			sone.setRequestUri(getSoneUri(identity.getRequestUri()));
 			sone.setLatestEdition(Numbers.safeParseLong(identity.getProperty("Sone.LatestEdition"), (long) 0));
@@ -1095,6 +1061,11 @@ 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, true);
+		if (followedSone == null) {
+			logger.log(Level.INFO, String.format("Ignored Sone with invalid ID: %s", soneId));
+			return;
+		}
 		followSone(sone, getSone(soneId));
 	}
 
@@ -1619,6 +1590,12 @@ 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) {
+			sone.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));
@@ -2164,6 +2141,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(sone.getAvatar());
 
 			/* save profile fields. */
 			int fieldCounter = 0;
@@ -2443,8 +2421,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;
 		}
@@ -2564,7 +2547,7 @@ public class Core extends AbstractService implements IdentityListener, UpdateLis
 			@Override
 			@SuppressWarnings("synthetic-access")
 			public void run() {
-				Sone sone = getRemoteSone(identity.getId());
+				Sone sone = getRemoteSone(identity.getId(), false);
 				sone.setIdentity(identity);
 				sone.setLatestEdition(Numbers.safeParseLong(identity.getProperty("Sone.LatestEdition"), sone.getLatestEdition()));
 				soneDownloader.addSone(sone);