From 9d493ac966db2e016f73efcdcfb65dfb10bf8114 Mon Sep 17 00:00:00 2001
From: Vitaly Takmazov
Date: Wed, 12 Dec 2018 15:12:27 +0300
Subject: UserInfo -> User

---
 src/main/java/com/juick/User.java | 27 +++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)

(limited to 'src/main/java/com/juick/User.java')

diff --git a/src/main/java/com/juick/User.java b/src/main/java/com/juick/User.java
index 7221e416..78d47139 100644
--- a/src/main/java/com/juick/User.java
+++ b/src/main/java/com/juick/User.java
@@ -53,6 +53,9 @@ public class User {
     private URI uri;
     private Instant seen;
     private boolean verified;
+    private String country;
+    private String url;
+    private String description;
 
     public User() {
         tokens = new ArrayList<>();
@@ -232,4 +235,28 @@ public class User {
     public void setVerified(boolean verified) {
         this.verified = verified;
     }
+
+    public String getCountry() {
+        return country;
+    }
+
+    public void setCountry(String country) {
+        this.country = country;
+    }
+
+    public String getUrl() {
+        return url;
+    }
+
+    public void setUrl(String url) {
+        this.url = url;
+    }
+
+    public String getDescription() {
+        return description;
+    }
+
+    public void setDescription(String description) {
+        this.description = description;
+    }
 }
-- 
cgit v1.2.3


From a429149e6d1fd0928670f3d7f0d4c67fb9f07fee Mon Sep 17 00:00:00 2001
From: Vitaly Takmazov
Date: Mon, 31 Dec 2018 11:21:58 +0300
Subject: Cleanup XML serialization

---
 src/main/java/com/juick/Message.java | 4 +++-
 src/main/java/com/juick/User.java    | 2 ++
 2 files changed, 5 insertions(+), 1 deletion(-)

(limited to 'src/main/java/com/juick/User.java')

diff --git a/src/main/java/com/juick/Message.java b/src/main/java/com/juick/Message.java
index 10380826..00527b41 100644
--- a/src/main/java/com/juick/Message.java
+++ b/src/main/java/com/juick/Message.java
@@ -188,7 +188,7 @@ public class Message implements Comparable {
         this.ts = timestamp;
     }
 
-    @XmlElement(name = "to", namespace = "http://juick.com/user")
+    @XmlTransient
     public User getTo() {
         return to;
     }
@@ -363,6 +363,7 @@ public class Message implements Comparable {
         this.replyUri = replyUri;
     }
 
+    @XmlAttribute(name = "html")
     public boolean isHtml() {
         return html;
     }
@@ -371,6 +372,7 @@ public class Message implements Comparable {
         this.html = html;
     }
 
+    @XmlTransient
     public URI getReplyToUri() {
         return replyToUri;
     }
diff --git a/src/main/java/com/juick/User.java b/src/main/java/com/juick/User.java
index 78d47139..f4c6b6db 100644
--- a/src/main/java/com/juick/User.java
+++ b/src/main/java/com/juick/User.java
@@ -209,6 +209,7 @@ public class User {
     }
 
     @Nonnull
+    @XmlTransient
     public URI getUri() {
         if (uri == null) {
             uri = URI.create(StringUtils.EMPTY);
@@ -228,6 +229,7 @@ public class User {
         this.seen = seen;
     }
 
+    @XmlTransient
     public boolean isVerified() {
         return verified;
     }
-- 
cgit v1.2.3


From b53425e6b036f6760a5d0a98537f99b8d9509d34 Mon Sep 17 00:00:00 2001
From: Vitaly Takmazov
Date: Tue, 26 Feb 2019 17:58:50 +0300
Subject: Fix recommendations set in API

---
 src/main/java/com/juick/User.java | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'src/main/java/com/juick/User.java')

diff --git a/src/main/java/com/juick/User.java b/src/main/java/com/juick/User.java
index f4c6b6db..84986010 100644
--- a/src/main/java/com/juick/User.java
+++ b/src/main/java/com/juick/User.java
@@ -65,12 +65,13 @@ public class User {
     @Override
     public boolean equals(Object obj) {
         return obj == this ||
-                (obj instanceof User && ((User) obj).getUid() == this.getUid());
+                (obj instanceof User && ((User) obj).getUid() == this.getUid()
+                        && ((User) obj).getUri().toString().equals(this.getUri().toString()));
     }
 
     @Override
     public int hashCode() {
-        return Objects.hash(uid);
+        return Objects.hash(uid, uri);
     }
 
     @Override
-- 
cgit v1.2.3


From b02d6b11957b32afe2ef569c095add695a7ecf28 Mon Sep 17 00:00:00 2001
From: Vitaly Takmazov
Date: Fri, 1 Mar 2019 15:56:43 +0300
Subject: Fix anonymous user check

---
 src/main/java/com/juick/User.java                     | 2 +-
 src/test/java/com/juick/server/tests/ServerTests.java | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

(limited to 'src/main/java/com/juick/User.java')

diff --git a/src/main/java/com/juick/User.java b/src/main/java/com/juick/User.java
index 84986010..f34f07a8 100644
--- a/src/main/java/com/juick/User.java
+++ b/src/main/java/com/juick/User.java
@@ -174,7 +174,7 @@ public class User {
     @XmlTransient
     @JsonIgnore
     public boolean isAnonymous() {
-        return false;
+        return uid == 0;
     }
 
     @Nonnull
diff --git a/src/test/java/com/juick/server/tests/ServerTests.java b/src/test/java/com/juick/server/tests/ServerTests.java
index a0d10988..3eb349e1 100644
--- a/src/test/java/com/juick/server/tests/ServerTests.java
+++ b/src/test/java/com/juick/server/tests/ServerTests.java
@@ -2002,4 +2002,9 @@ public class ServerTests {
         assertThat(xnodeinfo.get("server"), notNullValue());
         assertThat(xnodeinfo.get("software"), nullValue());
     }
+    @Test
+    public void anonymousUserFromZero() {
+        User user = userService.getUserByUID(0).orElse(AnonymousUser.INSTANCE);
+        assertThat(user.isAnonymous(), is(true));
+    }
 }
-- 
cgit v1.2.3