Merge remote-tracking branch 'upstream/master'
authorPete <pete@debu.gs>
Thu, 14 Jan 2021 12:02:49 +0000 (04:02 -0800)
committerPete <pete@debu.gs>
Thu, 14 Jan 2021 12:02:49 +0000 (04:02 -0800)
1  2 
renderer/renderer.go
service/service.go
static/style.css
templates/nav.tmpl
templates/notification.tmpl
templates/status.tmpl
templates/user.tmpl
templates/userlist.tmpl

Simple merge
index dddc2fc3ac5ae53ad7bf4b051760ecf517d03ba2,db44e1061f47c82f2a91113f6754cc4a158e205d..5f21cd87c46385173401cab9dce4f4dd7e559635
@@@ -435,8 -364,7 +366,7 @@@ func (s *service) NotificationPage(c *c
        if unreadCount > 0 {
                readID = notifications[0].ID
        }
 -      if len(notifications) == 20 && len(pg.MaxID) > 0 {
 +      if len(notifications) == notificationSz && len(pg.MaxID) > 0 {
                nextLink = "/notifications?max_id=" + pg.MaxID
        }
  
Simple merge
index 0c51d9e47f11a9d33c3625bb35ec930cd870d92f,97898c83b93092a1f4c61e9a7cb0ab3205efbd21..73582fdc748526a0430949c3c3b0276b81a899fc
@@@ -8,10 -8,10 +8,10 @@@
        </div>
        <div class="user-info-details-container">
                <div class="user-info-details-name">
-                       <a class="nav-link" href="/user/{{.User.ID}}">
 -                      <bdi class="status-dname"> {{EmojiFilter .User.DisplayName .User.Emojis}} </bdi>  
+                       <a class="nav-link" href="/user/{{.User.ID}}" accesskey="0" title="User profile (0)">
 -                              <span class="status-uname"> @{{.User.Acct}} </span>
 +                              <span class="status-uname"> {{.User.Acct}} </span>
                        </a>
-                       <span class="status-dname"> {{EmojiFilter .User.DisplayName .User.Emojis}} </span>  
++                      <bdi class="status-dname"> {{EmojiFilter .User.DisplayName .User.Emojis}} </bdi>  
                </div>
                <div class="user-info-details-nav">
                        <a class="nav-link" href="/timeline/home" accesskey="1" title="Home timeline (1)">home</a>
index 284a3ee494e62ac472bc4185cf53a94b5eab94d9,3977aa761aed8e6d7a0b99da81a07b00dbd9424b..e59894f020399d6177924f7a4c77d05b1f12c632
@@@ -17,7 -17,7 +17,7 @@@
  </div>
  
  {{range .Notifications}}
- <div class="notification-container {{.Type}} {{(StatusColor .Account.Acct)}} {{if .Pleroma}}{{if not .Pleroma.IsSeen}}unread{{end}}{{end}}">
 -<div class="status-container-container {{if .Pleroma}}{{if not .Pleroma.IsSeen}}unread{{end}}{{end}}">
++<div class="status-container-container {{.Type}} {{(StatusColor .Account.Acct)}} {{if .Pleroma}}{{if not .Pleroma.IsSeen}}unread{{end}}{{end}}">
        {{if eq .Type "follow"}}
        <div class="notification-follow-container">
                <div class="status-profile-img-container">
                </div>
                <div class="notification-follow">
                        <div class="notification-info-text">
 -                              <bdi class="status-dname"> {{EmojiFilter .Account.DisplayName .Account.Emojis}} </bdi>  
 -                              <span class="notification-text"> followed you - 
 +                              <a class="nav-link" href="/user/{{.Account.ID}}">
 +                                      <span class="status-uname"> {{.Account.Acct}} </span>
 +                              </a>
-                               <span class="status-dname"> {{EmojiFilter .Account.DisplayName .Account.Emojis}} </span>  
-                               <span> followed you </span>
-                               <span>
-                                       - <time datetime="{{FormatTimeRFC3339 .CreatedAt}}" title="{{FormatTimeRFC822 .CreatedAt}}">{{TimeSince .CreatedAt}}</time> 
++                              <bdi class="status-dname"> {{EmojiFilter .Account.DisplayName .Account.Emojis}} </bdi>
++                              <span class="notification-text"> followed you -
+                                       <time datetime="{{FormatTimeRFC3339 .CreatedAt}}" title="{{FormatTimeRFC822 .CreatedAt}}">{{TimeSince .CreatedAt}}</time> 
                                </span>
                        </div>
                        <div>
                        <img class="status-profile-img" src="{{.Account.AvatarStatic}}" title="@{{.Account.Acct}}" alt="avatar" height="48" />
                </a>
                <a href="/user/{{.Account.ID}}">
 -                      <span class="status-uname"> @{{.Account.Acct}} </span>
 +                      <span class="status-uname"> {{.Account.Acct}} </span>
                </a>
-               <span> retweeted your post </span>
-               <span>
-                       - <time datetime="{{FormatTimeRFC3339 .CreatedAt}}" title="{{FormatTimeRFC822 .CreatedAt}}">{{TimeSince .CreatedAt}}</time> 
+               <span class="notification-text"> retweeted your post - 
+                       <time datetime="{{FormatTimeRFC3339 .CreatedAt}}" title="{{FormatTimeRFC822 .CreatedAt}}">{{TimeSince .CreatedAt}}</time> 
                </span>
        </div>
        {{template "status" (WithContext .Status $.Ctx)}}
                <a class="img-link" href="/user/{{.Account.ID}}">
                        <img class="status-profile-img" src="{{.Account.AvatarStatic}}" title="@{{.Account.Acct}}" alt="avatar" height="48" />
                </a>
 -              <a href="/user/{{.Account.ID}}">
 -                      <span class="status-uname"> @{{.Account.Acct}} </span>
 +              <a class="nav-link" href="/user/{{.Account.ID}}">
 +                      <span class="status-uname"> {{.Account.Acct}} </span>
                </a>
++<<<<<<< HEAD
 +              <span class="status-dname"> {{EmojiFilter .Account.DisplayName .Account.Emojis}} </span>  
 +              <span> liked your post </span>
 +              <span>
 +                      - <time datetime="{{FormatTimeRFC3339 .CreatedAt}}" title="{{FormatTimeRFC822 .CreatedAt}}">{{TimeSince .CreatedAt}}</time> 
++=======
+               <span class="notification-text"> liked your post - 
+                       <time datetime="{{FormatTimeRFC3339 .CreatedAt}}" title="{{FormatTimeRFC822 .CreatedAt}}">{{TimeSince .CreatedAt}}</time> 
++>>>>>>> upstream/master
                </span>
        </div>
        {{template "status" (WithContext .Status $.Ctx)}}
index 6d8bf35e0bbc30ee4100bae6e02917e84e0bd322,6071b2fc803b220a0a966d16bd13ca443c611c92..c9468125a9bc71df7e223cf05de43e00db03af76
@@@ -5,12 -5,9 +5,12 @@@
                <a class="img-link" href="/user/{{.Account.ID}}">
                        <img class="status-profile-img" src="{{.Account.AvatarStatic}}" title="@{{.Account.Acct}}" alt="avatar" height="24" />
                </a>
 -              <bdi class="status-dname"> {{EmojiFilter .Account.DisplayName .Account.Emojis}} </bdi>  
 +              <a class="nav-link" href="/user/{{.Account.ID}}">
 +                      <span class="status-uname"> {{.Account.Acct}} </span>
 +              </a>
-               <span class="status-dname"> {{EmojiFilter .Account.DisplayName .Account.Emojis}} </span>  
++              <bdi class="status-dname"> {{EmojiFilter .Account.DisplayName .Account.Emojis}} </bdi>
                <a href="/user/{{.Account.ID}}"> 
-                       <span class="status-uname"> {{.Account.Acct}} </span> 
 -                      <span class="status-uname"> @{{.Account.Acct}} </span> 
++                      <span class="status-uname"> {{.Account.Acct}} </span>
                </a>
                retweeted
        </div>
                                                <input type="hidden" name="csrf_token" value="{{$.Ctx.CSRFToken}}">
                                                <input type="hidden" name="retweeted_by_id" value="{{.RetweetedByID}}">
                                                <input type="submit" value="{{$like}}" class="btn-link">
--                                              <a class="status-like-count" href="/likedby/{{.ID}}" title="click to see the the list"> 
++                                              <a class="status-like-count" href="/likedby/{{.ID}}" title="click to see the the list">
                                                        {{if and (not $.Ctx.AntiDopamineMode) .FavouritesCount}}
                                                                ({{DisplayInteractionCount .FavouritesCount}})
                                                        {{end}}
                                <div class="status-action status-action-last">
                                        <a class="status-time" href="{{if not .ShowReplies}}/thread/{{.ID}}{{end}}#status-{{.ID}}"
                                                {{if $.Ctx.ThreadInNewTab}}target="_blank"{{end}}> 
--                                              <time datetime="{{FormatTimeRFC3339 .CreatedAt}}" title="{{FormatTimeRFC822 .CreatedAt}}"> 
++                                              <time datetime="{{FormatTimeRFC3339 .CreatedAt}}" title="{{FormatTimeRFC822 .CreatedAt}}">
                                                        {{TimeSince .CreatedAt}}
                                                </time> 
                                        </a>
index 4bbd86d02ffee3432bdde86bcb3d474ae53956fd,b3461c6cc846855278c3e621214c6c4def0cb636..55e7f05c536355b0b2a729f249db043423095d6e
@@@ -11,8 -11,8 +11,8 @@@
        </div>
        <div class="user-profile-details-container">
                <div>
-                       <span class="status-dname"> {{EmojiFilter .User.DisplayName .User.Emojis}} </span>  
 +                      <span class="status-uname"> {{.User.Acct}} </span>
 -                      <span class="status-uname"> @{{.User.Acct}} </span>
+                       <bdi class="status-dname"> {{EmojiFilter .User.DisplayName .User.Emojis}} </bdi>  
                        <a class="remote-link" href="{{.User.URL}}" target="_blank" title="remote profile">
                                source
                        </a>
Simple merge