Merge branch 'main' into more-upgrade-apub-3

ui/src/components/post-listing.tsx

@@ -101,6 +101,9 @@ export class PostListing extends Component<PostListingProps, PostListingState> {
     this.state.upvotes = nextProps.post.upvotes;
     this.state.downvotes = nextProps.post.downvotes;
     this.state.score = nextProps.post.score;
+    if (this.props.post.id !== nextProps.post.id) {
+      this.state.imageExpanded = false;
+    }
     this.setState(this.state);
   }
 

ui/src/components/sponsors.tsx

@@ -17,6 +17,8 @@ interface SilverUser {
 }
 
 let general = [
+  'Rachel Schmitz',
+  'comradeda',
   'ybaumy',
   'dude in phx',
   'twilight loki',

ui/src/components/user.tsx

@@ -93,7 +93,7 @@ export class User extends Component<any, UserState> {
     username: null,
     follows: [],
     moderates: [],
-    loading: false,
+    loading: true,
     avatarLoading: false,
     view: User.getViewFromProps(this.props.match.view),
     sort: User.getSortTypeFromProps(this.props.match.sort),
@@ -208,13 +208,6 @@ export class User extends Component<any, UserState> {
   render() {
     return (
       <div class="container">
-        {this.state.loading ? (
-          <h5>
-            <svg class="icon icon-spinner spin">
-              <use xlinkHref="#icon-spinner"></use>
-            </svg>
-          </h5>
-        ) : (
         <div class="row">
           <div class="col-12 col-md-8">
             <h5>
@@ -228,7 +221,15 @@ export class User extends Component<any, UserState> {
               )}
               <span>/u/{this.state.username}</span>
             </h5>
-              {this.selects()}
+            {this.state.loading ? (
+              <h5>
+                <svg class="icon icon-spinner spin">
+                  <use xlinkHref="#icon-spinner"></use>
+                </svg>
+              </h5>
+            ) : (
+              this.selects()
+            )}
             <UserDetails
               user_id={this.state.user_id}
               username={this.state.username}
@@ -241,15 +242,17 @@ export class User extends Component<any, UserState> {
               onPageChange={this.handlePageChange}
             />
           </div>
+
+          {!this.state.loading && (
             <div class="col-12 col-md-4">
               {this.userInfo()}
               {this.isCurrentUser && this.userSettings()}
               {this.moderates()}
               {this.follows()}
             </div>
-          </div>
           )}
         </div>
+      </div>
     );
   }
 
@@ -1042,6 +1045,7 @@ export class User extends Component<any, UserState> {
             UserService.Instance.user.show_avatars;
           this.state.userSettingsForm.matrix_user_id = this.state.user.matrix_user_id;
         }
+        this.state.loading = false;
         this.setState(this.state);
       }
     } else if (res.op == UserOperation.SaveUserSettings) {

ui/src/utils.ts

@@ -825,6 +825,11 @@ export function editPostRes(data: PostResponse, post: Post) {
     post.url = data.post.url;
     post.name = data.post.name;
     post.nsfw = data.post.nsfw;
+    post.deleted = data.post.deleted;
+    post.removed = data.post.removed;
+    post.stickied = data.post.stickied;
+    post.body = data.post.body;
+    post.locked = data.post.locked;
   }
 }