From 1b38e33bd38ac859ee4cf9fe2a84b498b816570f Mon Sep 17 00:00:00 2001
From: Dessalines <tyhou13@gmx.com>
Date: Mon, 22 Jun 2020 16:13:02 -0400
Subject: [PATCH 01/13] Fixing deploy script.

---
 docker/prod/deploy.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docker/prod/deploy.sh b/docker/prod/deploy.sh
index 0ad47bcd809..46ef77657aa 100755
--- a/docker/prod/deploy.sh
+++ b/docker/prod/deploy.sh
@@ -37,7 +37,7 @@ export COMPOSE_DOCKER_CLI_BUILD=1
 export DOCKER_BUILDKIT=1
 
 # Rebuilding docker
-docker-compose build
+docker build ../../ -f Dockerfile
 docker tag dev_lemmy:latest dessalines/lemmy:x64-$new_tag
 docker push dessalines/lemmy:x64-$new_tag
 

From 32d1f42626caa3659e0bcfc635c0a6b80be9e0a7 Mon Sep 17 00:00:00 2001
From: Dessalines <tyhou13@gmx.com>
Date: Mon, 22 Jun 2020 16:15:31 -0400
Subject: [PATCH 02/13] Version v0.6.80

---
 ansible/VERSION                | 2 +-
 docker/prod/docker-compose.yml | 2 +-
 server/src/version.rs          | 2 +-
 ui/src/version.ts              | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/ansible/VERSION b/ansible/VERSION
index ed2321280fe..15b411ae23b 100644
--- a/ansible/VERSION
+++ b/ansible/VERSION
@@ -1 +1 @@
-v0.6.79
+v0.6.80
diff --git a/docker/prod/docker-compose.yml b/docker/prod/docker-compose.yml
index 863ff593b54..aa2842b3b3b 100644
--- a/docker/prod/docker-compose.yml
+++ b/docker/prod/docker-compose.yml
@@ -12,7 +12,7 @@ services:
     restart: always
 
   lemmy:
-    image: dessalines/lemmy:v0.6.79
+    image: dessalines/lemmy:v0.6.80
     ports:
       - "127.0.0.1:8536:8536"
     restart: always
diff --git a/server/src/version.rs b/server/src/version.rs
index a27f3acb9f0..667dd08e498 100644
--- a/server/src/version.rs
+++ b/server/src/version.rs
@@ -1 +1 @@
-pub const VERSION: &str = "v0.6.79";
+pub const VERSION: &str = "v0.6.80";
diff --git a/ui/src/version.ts b/ui/src/version.ts
index 50df125c533..fc803dcb02e 100644
--- a/ui/src/version.ts
+++ b/ui/src/version.ts
@@ -1 +1 @@
-export const version: string = 'v0.6.79';
+export const version: string = 'v0.6.80';

From 234be6fb095d2cad1342a463c86ab032650915a7 Mon Sep 17 00:00:00 2001
From: Dessalines <tyhou13@gmx.com>
Date: Mon, 22 Jun 2020 17:52:39 -0400
Subject: [PATCH 03/13] Changing to prod_lemmy:latest

---
 docker/prod/deploy.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docker/prod/deploy.sh b/docker/prod/deploy.sh
index 46ef77657aa..496b598e76c 100755
--- a/docker/prod/deploy.sh
+++ b/docker/prod/deploy.sh
@@ -37,8 +37,8 @@ export COMPOSE_DOCKER_CLI_BUILD=1
 export DOCKER_BUILDKIT=1
 
 # Rebuilding docker
-docker build ../../ -f Dockerfile
-docker tag dev_lemmy:latest dessalines/lemmy:x64-$new_tag
+docker build ../../ -f Dockerfile --tag prod_lemmy:latest
+docker tag prod_lemmy:latest dessalines/lemmy:x64-$new_tag
 docker push dessalines/lemmy:x64-$new_tag
 
 # Build for Raspberry Pi / other archs

From c9dcb2662cc78c24cf34d0fa84664af6c4ad5cc0 Mon Sep 17 00:00:00 2001
From: Dessalines <tyhou13@gmx.com>
Date: Mon, 22 Jun 2020 17:53:47 -0400
Subject: [PATCH 04/13] Version v0.6.81

---
 ansible/VERSION                | 2 +-
 docker/prod/docker-compose.yml | 2 +-
 server/src/version.rs          | 2 +-
 ui/src/version.ts              | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/ansible/VERSION b/ansible/VERSION
index 15b411ae23b..ec2e67a3897 100644
--- a/ansible/VERSION
+++ b/ansible/VERSION
@@ -1 +1 @@
-v0.6.80
+v0.6.81
diff --git a/docker/prod/docker-compose.yml b/docker/prod/docker-compose.yml
index aa2842b3b3b..5d9046748b1 100644
--- a/docker/prod/docker-compose.yml
+++ b/docker/prod/docker-compose.yml
@@ -12,7 +12,7 @@ services:
     restart: always
 
   lemmy:
-    image: dessalines/lemmy:v0.6.80
+    image: dessalines/lemmy:v0.6.81
     ports:
       - "127.0.0.1:8536:8536"
     restart: always
diff --git a/server/src/version.rs b/server/src/version.rs
index 667dd08e498..63dcfb63605 100644
--- a/server/src/version.rs
+++ b/server/src/version.rs
@@ -1 +1 @@
-pub const VERSION: &str = "v0.6.80";
+pub const VERSION: &str = "v0.6.81";
diff --git a/ui/src/version.ts b/ui/src/version.ts
index fc803dcb02e..f41abb9b167 100644
--- a/ui/src/version.ts
+++ b/ui/src/version.ts
@@ -1 +1 @@
-export const version: string = 'v0.6.80';
+export const version: string = 'v0.6.81';

From 9dfdf7869744e98c6e5030fa4df9a7a72e64a5d1 Mon Sep 17 00:00:00 2001
From: Dessalines <tyhou13@gmx.com>
Date: Mon, 22 Jun 2020 18:29:08 -0400
Subject: [PATCH 05/13] Moving save behind more menu. Fixes #827

---
 ui/src/components/comment-node.tsx | 43 +++++++++++++++++-------------
 1 file changed, 24 insertions(+), 19 deletions(-)

diff --git a/ui/src/components/comment-node.tsx b/ui/src/components/comment-node.tsx
index 4a063307c1a..673a0e77006 100644
--- a/ui/src/components/comment-node.tsx
+++ b/ui/src/components/comment-node.tsx
@@ -294,25 +294,6 @@ export class CommentNode extends Component<CommentNodeProps, CommentNodeState> {
                           )}
                         </button>
                       )}
-                      <button
-                        class="btn btn-link btn-animate text-muted"
-                        onClick={linkEvent(this, this.handleSaveCommentClick)}
-                        data-tippy-content={
-                          node.comment.saved ? i18n.t('unsave') : i18n.t('save')
-                        }
-                      >
-                        {this.state.saveLoading ? (
-                          this.loadingIcon
-                        ) : (
-                          <svg
-                            class={`icon icon-inline ${
-                              node.comment.saved && 'text-warning'
-                            }`}
-                          >
-                            <use xlinkHref="#icon-star"></use>
-                          </svg>
-                        )}
-                      </button>
                       <button
                         class="btn btn-link btn-animate text-muted"
                         onClick={linkEvent(this, this.handleReplyClick)}
@@ -348,6 +329,30 @@ export class CommentNode extends Component<CommentNodeProps, CommentNodeState> {
                             </button>
                           )}
                           {!this.props.showContext && this.linkBtn}
+                          <button
+                            class="btn btn-link btn-animate text-muted"
+                            onClick={linkEvent(
+                              this,
+                              this.handleSaveCommentClick
+                            )}
+                            data-tippy-content={
+                              node.comment.saved
+                                ? i18n.t('unsave')
+                                : i18n.t('save')
+                            }
+                          >
+                            {this.state.saveLoading ? (
+                              this.loadingIcon
+                            ) : (
+                              <svg
+                                class={`icon icon-inline ${
+                                  node.comment.saved && 'text-warning'
+                                }`}
+                              >
+                                <use xlinkHref="#icon-star"></use>
+                              </svg>
+                            )}
+                          </button>
                           <button
                             className="btn btn-link btn-animate text-muted"
                             onClick={linkEvent(this, this.handleViewSource)}

From 1777070b46e33a6a5b651c5477416f854b164ad5 Mon Sep 17 00:00:00 2001
From: Dessalines <tyhou13@gmx.com>
Date: Mon, 22 Jun 2020 18:33:51 -0400
Subject: [PATCH 06/13] Changing edit to save for some forms. Fixes #829

---
 ui/src/components/comment-form.tsx | 2 +-
 ui/src/components/site-form.tsx    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/ui/src/components/comment-form.tsx b/ui/src/components/comment-form.tsx
index 79aa91bdd06..d6641a79fc7 100644
--- a/ui/src/components/comment-form.tsx
+++ b/ui/src/components/comment-form.tsx
@@ -61,7 +61,7 @@ export class CommentForm extends Component<CommentFormProps, CommentFormState> {
     buttonTitle: !this.props.node
       ? capitalizeFirstLetter(i18n.t('post'))
       : this.props.edit
-      ? capitalizeFirstLetter(i18n.t('edit'))
+      ? capitalizeFirstLetter(i18n.t('save'))
       : capitalizeFirstLetter(i18n.t('reply')),
     previewMode: false,
     loading: false,
diff --git a/ui/src/components/site-form.tsx b/ui/src/components/site-form.tsx
index f0c80585e5d..43d24365d6f 100644
--- a/ui/src/components/site-form.tsx
+++ b/ui/src/components/site-form.tsx
@@ -78,7 +78,7 @@ export class SiteForm extends Component<SiteFormProps, SiteFormState> {
         <form onSubmit={linkEvent(this, this.handleCreateSiteSubmit)}>
           <h5>{`${
             this.props.site
-              ? capitalizeFirstLetter(i18n.t('edit'))
+              ? capitalizeFirstLetter(i18n.t('save'))
               : capitalizeFirstLetter(i18n.t('name'))
           } ${i18n.t('your_site')}`}</h5>
           <div class="form-group row">

From ef2adcc95d21722066c5e265adc0c143705c6e8f Mon Sep 17 00:00:00 2001
From: Dessalines <tyhou13@gmx.com>
Date: Mon, 22 Jun 2020 18:44:06 -0400
Subject: [PATCH 07/13] Increasing comment margins. Fixes #826

---
 ui/src/components/comment-node.tsx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ui/src/components/comment-node.tsx b/ui/src/components/comment-node.tsx
index 673a0e77006..4d29fe17320 100644
--- a/ui/src/components/comment-node.tsx
+++ b/ui/src/components/comment-node.tsx
@@ -132,7 +132,7 @@ export class CommentNode extends Component<CommentNodeProps, CommentNodeState> {
       >
         <div
           id={`comment-${node.comment.id}`}
-          className={`details comment-node border-top border-light ${
+          className={`details comment-node border-top border-light py-2 ${
             this.isCommentNew ? 'mark' : ''
           }`}
           style={
@@ -148,7 +148,7 @@ export class CommentNode extends Component<CommentNodeProps, CommentNodeState> {
               'ml-2'
             }`}
           >
-            <div class="d-flex flex-wrap align-items-center mb-1 mt-1 text-muted small">
+            <div class="d-flex flex-wrap align-items-center text-muted small">
               <span class="mr-2">
                 <UserListing
                   user={{

From c1dbeb43c957b533fe9e20b241bda32d54c0d1a2 Mon Sep 17 00:00:00 2001
From: Dessalines <tyhou13@gmx.com>
Date: Mon, 22 Jun 2020 18:50:06 -0400
Subject: [PATCH 08/13] Making comment, post, and message preview a card. Fixes
 #817

---
 ui/src/components/comment-form.tsx         | 2 +-
 ui/src/components/post-form.tsx            | 2 +-
 ui/src/components/private-message-form.tsx | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/ui/src/components/comment-form.tsx b/ui/src/components/comment-form.tsx
index d6641a79fc7..591bbf1b21c 100644
--- a/ui/src/components/comment-form.tsx
+++ b/ui/src/components/comment-form.tsx
@@ -138,7 +138,7 @@ export class CommentForm extends Component<CommentFormProps, CommentFormState> {
               />
               {this.state.previewMode && (
                 <div
-                  className="md-div"
+                  className="card card-body md-div"
                   dangerouslySetInnerHTML={mdToHtml(
                     this.state.commentForm.content
                   )}
diff --git a/ui/src/components/post-form.tsx b/ui/src/components/post-form.tsx
index d424538bdf7..6840c2d48ba 100644
--- a/ui/src/components/post-form.tsx
+++ b/ui/src/components/post-form.tsx
@@ -284,7 +284,7 @@ export class PostForm extends Component<PostFormProps, PostFormState> {
               />
               {this.state.previewMode && (
                 <div
-                  className="md-div"
+                  className="card card-body md-div"
                   dangerouslySetInnerHTML={mdToHtml(this.state.postForm.body)}
                 />
               )}
diff --git a/ui/src/components/private-message-form.tsx b/ui/src/components/private-message-form.tsx
index 7667f5a11f4..6ad7de779a5 100644
--- a/ui/src/components/private-message-form.tsx
+++ b/ui/src/components/private-message-form.tsx
@@ -154,7 +154,7 @@ export class PrivateMessageForm extends Component<
               />
               {this.state.previewMode && (
                 <div
-                  className="md-div"
+                  className="card card-body md-div"
                   dangerouslySetInnerHTML={mdToHtml(
                     this.state.privateMessageForm.content
                   )}

From 63fbf70eaa448730abbb54370441056f0a5f9487 Mon Sep 17 00:00:00 2001
From: Dessalines <tyhou13@gmx.com>
Date: Mon, 22 Jun 2020 19:05:55 -0400
Subject: [PATCH 09/13] Disable submit when loading. Fixes #706

---
 ui/src/components/comment-form.tsx         | 2 +-
 ui/src/components/community-form.tsx       | 6 +++++-
 ui/src/components/post-form.tsx            | 4 +++-
 ui/src/components/private-message-form.tsx | 6 +++++-
 ui/src/components/site-form.tsx            | 6 +++++-
 5 files changed, 19 insertions(+), 5 deletions(-)

diff --git a/ui/src/components/comment-form.tsx b/ui/src/components/comment-form.tsx
index 591bbf1b21c..24bfb7cbb77 100644
--- a/ui/src/components/comment-form.tsx
+++ b/ui/src/components/comment-form.tsx
@@ -151,7 +151,7 @@ export class CommentForm extends Component<CommentFormProps, CommentFormState> {
               <button
                 type="submit"
                 class="btn btn-sm btn-secondary mr-2"
-                disabled={this.props.disabled}
+                disabled={this.props.disabled || this.state.loading}
               >
                 {this.state.loading ? (
                   <svg class="icon icon-spinner spin">
diff --git a/ui/src/components/community-form.tsx b/ui/src/components/community-form.tsx
index eedc2003808..90e127383ae 100644
--- a/ui/src/components/community-form.tsx
+++ b/ui/src/components/community-form.tsx
@@ -207,7 +207,11 @@ export class CommunityForm extends Component<
           )}
           <div class="form-group row">
             <div class="col-12">
-              <button type="submit" class="btn btn-secondary mr-2">
+              <button
+                type="submit"
+                class="btn btn-secondary mr-2"
+                disabled={this.state.loading}
+              >
                 {this.state.loading ? (
                   <svg class="icon icon-spinner spin">
                     <use xlinkHref="#icon-spinner"></use>
diff --git a/ui/src/components/post-form.tsx b/ui/src/components/post-form.tsx
index 6840c2d48ba..ee805a7c040 100644
--- a/ui/src/components/post-form.tsx
+++ b/ui/src/components/post-form.tsx
@@ -360,7 +360,9 @@ export class PostForm extends Component<PostFormProps, PostFormState> {
           <div class="form-group row">
             <div class="col-sm-10">
               <button
-                disabled={!this.state.postForm.community_id}
+                disabled={
+                  !this.state.postForm.community_id || this.state.loading
+                }
                 type="submit"
                 class="btn btn-secondary mr-2"
               >
diff --git a/ui/src/components/private-message-form.tsx b/ui/src/components/private-message-form.tsx
index 6ad7de779a5..496f3ae5755 100644
--- a/ui/src/components/private-message-form.tsx
+++ b/ui/src/components/private-message-form.tsx
@@ -183,7 +183,11 @@ export class PrivateMessageForm extends Component<
           )}
           <div class="form-group row">
             <div class="offset-sm-2 col-sm-10">
-              <button type="submit" class="btn btn-secondary mr-2">
+              <button
+                type="submit"
+                class="btn btn-secondary mr-2"
+                disabled={this.state.loading}
+              >
                 {this.state.loading ? (
                   <svg class="icon icon-spinner spin">
                     <use xlinkHref="#icon-spinner"></use>
diff --git a/ui/src/components/site-form.tsx b/ui/src/components/site-form.tsx
index 43d24365d6f..a51286c81cd 100644
--- a/ui/src/components/site-form.tsx
+++ b/ui/src/components/site-form.tsx
@@ -175,7 +175,11 @@ export class SiteForm extends Component<SiteFormProps, SiteFormState> {
           </div>
           <div class="form-group row">
             <div class="col-12">
-              <button type="submit" class="btn btn-secondary mr-2">
+              <button
+                type="submit"
+                class="btn btn-secondary mr-2"
+                disabled={this.state.loading}
+              >
                 {this.state.loading ? (
                   <svg class="icon icon-spinner spin">
                     <use xlinkHref="#icon-spinner"></use>

From be3a375caef2529d57598a2e3f2daa49eb27b441 Mon Sep 17 00:00:00 2001
From: Dessalines <tyhou13@gmx.com>
Date: Mon, 22 Jun 2020 19:21:13 -0400
Subject: [PATCH 10/13] Instant mark all as read. Fixes #830

---
 ui/src/components/inbox.tsx | 20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/ui/src/components/inbox.tsx b/ui/src/components/inbox.tsx
index 4fa1498ac4e..edbacd518c5 100644
--- a/ui/src/components/inbox.tsx
+++ b/ui/src/components/inbox.tsx
@@ -123,7 +123,10 @@ export class Inbox extends Component<any, InboxState> {
               this.state.unreadOrAll == UnreadOrAll.Unread && (
                 <ul class="list-inline mb-1 text-muted small font-weight-bold">
                   <li className="list-inline-item">
-                    <span class="pointer" onClick={this.markAllAsRead}>
+                    <span
+                      class="pointer"
+                      onClick={linkEvent(this, this.markAllAsRead)}
+                    >
                       {i18n.t('mark_all_as_read')}
                     </span>
                   </li>
@@ -392,8 +395,14 @@ export class Inbox extends Component<any, InboxState> {
     this.refetch();
   }
 
-  markAllAsRead() {
+  markAllAsRead(i: Inbox) {
     WebSocketService.Instance.markAllAsRead();
+    i.state.replies = [];
+    i.state.mentions = [];
+    i.state.messages = [];
+    i.sendUnreadCount();
+    window.scrollTo(0, 0);
+    i.setState(i.state);
   }
 
   parseMessage(msg: WebSocketJsonResponse) {
@@ -447,12 +456,7 @@ export class Inbox extends Component<any, InboxState> {
       this.setState(this.state);
       setupTippy();
     } else if (res.op == UserOperation.MarkAllAsRead) {
-      this.state.replies = [];
-      this.state.mentions = [];
-      this.state.messages = [];
-      this.sendUnreadCount();
-      window.scrollTo(0, 0);
-      this.setState(this.state);
+      // Moved to be instant
     } else if (res.op == UserOperation.EditComment) {
       let data = res.data as CommentResponse;
       editCommentRes(data, this.state.replies);

From 318b8c691a75f274d845dbf65f2edaf036479239 Mon Sep 17 00:00:00 2001
From: Dessalines <tyhou13@gmx.com>
Date: Mon, 22 Jun 2020 19:27:42 -0400
Subject: [PATCH 11/13] Coerce empty post form to undefined. Fixes #602

---
 ui/src/components/post-form.tsx | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/ui/src/components/post-form.tsx b/ui/src/components/post-form.tsx
index ee805a7c040..c507ab3e700 100644
--- a/ui/src/components/post-form.tsx
+++ b/ui/src/components/post-form.tsx
@@ -408,6 +408,12 @@ export class PostForm extends Component<PostFormProps, PostFormState> {
 
   handlePostSubmit(i: PostForm, event: any) {
     event.preventDefault();
+
+    // Coerce empty url string to undefined
+    if (i.state.postForm.url && i.state.postForm.url === '') {
+      i.state.postForm.url = undefined;
+    }
+
     if (i.props.post) {
       WebSocketService.Instance.editPost(i.state.postForm);
     } else {

From 54c735841e96835d3202f570537a721251ee4b24 Mon Sep 17 00:00:00 2001
From: Dessalines <tyhou13@gmx.com>
Date: Mon, 22 Jun 2020 19:32:30 -0400
Subject: [PATCH 12/13] Version v0.6.82

---
 ansible/VERSION                | 2 +-
 docker/prod/docker-compose.yml | 2 +-
 server/src/version.rs          | 2 +-
 ui/src/version.ts              | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/ansible/VERSION b/ansible/VERSION
index ec2e67a3897..66dedacebdf 100644
--- a/ansible/VERSION
+++ b/ansible/VERSION
@@ -1 +1 @@
-v0.6.81
+v0.6.82
diff --git a/docker/prod/docker-compose.yml b/docker/prod/docker-compose.yml
index 5d9046748b1..bee5d75e3cc 100644
--- a/docker/prod/docker-compose.yml
+++ b/docker/prod/docker-compose.yml
@@ -12,7 +12,7 @@ services:
     restart: always
 
   lemmy:
-    image: dessalines/lemmy:v0.6.81
+    image: dessalines/lemmy:v0.6.82
     ports:
       - "127.0.0.1:8536:8536"
     restart: always
diff --git a/server/src/version.rs b/server/src/version.rs
index 63dcfb63605..d7d3193d6d9 100644
--- a/server/src/version.rs
+++ b/server/src/version.rs
@@ -1 +1 @@
-pub const VERSION: &str = "v0.6.81";
+pub const VERSION: &str = "v0.6.82";
diff --git a/ui/src/version.ts b/ui/src/version.ts
index f41abb9b167..ed281fdebc3 100644
--- a/ui/src/version.ts
+++ b/ui/src/version.ts
@@ -1 +1 @@
-export const version: string = 'v0.6.81';
+export const version: string = 'v0.6.82';

From bca76f1f2f4f45ff46b1289d794d61d7fa977922 Mon Sep 17 00:00:00 2001
From: Dessalines <tyhou13@gmx.com>
Date: Mon, 22 Jun 2020 20:30:26 -0400
Subject: [PATCH 13/13] Adding pict-rs to release notes.

---
 RELEASES.md | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/RELEASES.md b/RELEASES.md
index 25c30861a7d..44de088aa56 100644
--- a/RELEASES.md
+++ b/RELEASES.md
@@ -1,4 +1,4 @@
-# Lemmy v0.7.0 Release (2020-06-2X)
+# Lemmy v0.7.0 Release (2020-06-22)
 
 ## Breaking Change to our image server: Pictshare to Pict-rs migration guide
 
@@ -17,10 +17,11 @@ You'll also have to update your nginx config, use the [one here](https://github.
 
 *You'll have to log in again to pick up your avatar*
 
-Apart from that, we've closed [~90 issues!](https://github.com/LemmyNet/lemmy/milestone/16?closed=1), including:
+Apart from that, we've closed [~100 issues!](https://github.com/LemmyNet/lemmy/milestone/16?closed=1), including:
 
 - Site-wide list of recent comments.
 - Reconnecting websockets.
+- Swapped out pictshare for [pict-rs](https://git.asonix.dog/asonix/pict-rs).
 - Lots more themes, including a default light one.
 - Expandable embeds for post links (and thumbnails), from iframely.
 - Better icons.