Fxing conflicts

2019-02-08 13:13:11 -08:00 · 2019-02-08 13:13:11 -08:00 · 92874b6902
parent 70c05a0c08 da0a5535eb
commit 92874b6902
24 changed files with 1103 additions and 14 deletions
--- a/src/App.scss
+++ b/src/App.scss
@ -719,3 +719,17 @@ nav {
    margin-right: 0.8em;
  }
 }
+
+.login-hint {
+  text-align: center;
+  
+  @media all and (min-width: 801px) {
+    display: none;
+  }
+
+  a {
+    display: inline-block;
+    padding: 1em 0px;
+    width: 100%;
+  }
+}
--- a/src/App.vue
+++ b/src/App.vue
@ -37,6 +37,11 @@
        </div>
      </div>
      <div class="main">
+        <div v-if="!currentUser" class="login-hint panel panel-default">
+          <router-link :to="{ name: 'login' }" class="panel-body">
+            {{ $t("login.hint") }}
+          </router-link>
+        </div>
        <transition name="fade">
          <router-view></router-view>
        </transition>
--- a/src/boot/after_store.js
+++ b/src/boot/after_store.js
@ -84,6 +84,7 @@ const afterStoreSetup = ({ store, i18n }) => {
          copyInstanceOption('loginMethod')
          copyInstanceOption('scopeCopy')
          copyInstanceOption('subjectLineBehavior')
+          copyInstanceOption('postContentType')
          copyInstanceOption('alwaysShowSubjectInput')
          copyInstanceOption('noAttachmentLinks')
          copyInstanceOption('showFeaturesPanel')
--- a/src/components/post_status_form/post_status_form.js
+++ b/src/components/post_status_form/post_status_form.js
@ -65,7 +65,6 @@ const PostStatusForm = {
      newStatus: {
        spoilerText: this.subject || '',
        status: statusText,
-        contentType: 'text/plain',
        nsfw: false,
        files: [],
        visibility: scope
@ -167,6 +166,11 @@ const PostStatusForm = {
    },
    formattingOptionsEnabled () {
      return this.$store.state.instance.formattingOptionsEnabled
+    },
+    defaultPostContentType () {
+      return typeof this.$store.state.config.postContentType === 'undefined'
+        ? this.$store.state.instance.postContentType
+        : this.$store.state.config.postContentType
    }
  },
  methods: {
--- a/src/components/post_status_form/post_status_form.vue
+++ b/src/components/post_status_form/post_status_form.vue
@ -35,7 +35,7 @@
      <div class="visibility-tray">
        <span class="text-format" v-if="formattingOptionsEnabled">
          <label for="post-content-type" class="select">
-            <select id="post-content-type" v-model="newStatus.contentType" class="form-control">
+            <select id="post-content-type" v-model="defaultPostContentType" class="form-control">
              <option value="text/plain">{{$t('post_status.content_type.plain_text')}}</option>
              <option value="text/html">HTML</option>
              <option value="text/markdown">Markdown</option>
--- a/src/components/settings/settings.js
+++ b/src/components/settings/settings.js
@ -46,6 +46,11 @@ const settings = {
        : user.subjectLineBehavior,
      subjectLineBehaviorDefault: instance.subjectLineBehavior,

+      postContentTypeLocal: typeof user.postContentType === 'undefined'
+        ? instance.postContentType
+        : user.postContentType,
+      postContentTypeDefault: instance.postContentType,
+
      alwaysShowSubjectInputLocal: typeof user.alwaysShowSubjectInput === 'undefined'
        ? instance.alwaysShowSubjectInput
        : user.alwaysShowSubjectInput,
@ -157,6 +162,9 @@ const settings = {
    subjectLineBehaviorLocal (value) {
      this.$store.dispatch('setOption', { name: 'subjectLineBehavior', value })
    },
+    postContentTypeLocal (value) {
+      this.$store.dispatch('setOption', { name: 'postContentType', value })
+    },
    stopGifs (value) {
      this.$store.dispatch('setOption', { name: 'stopGifs', value })
    },
--- a/src/components/settings/settings.vue
+++ b/src/components/settings/settings.vue
@ -100,6 +100,28 @@
                </label>
              </div>
            </li>
+            <li>
+              <div>
+                {{$t('settings.post_status_content_type')}}
+                <label for="postContentType" class="select">
+                  <select id="postContentType" v-model="postContentTypeLocal">
+                    <option value="text/plain">
+                      {{$t('settings.status_content_type_plain')}}
+                      {{postContentTypeDefault == 'text/plain' ? $t('settings.instance_default_simple') : ''}}
+                    </option>
+                    <option value="text/html">
+                      HTML
+                      {{postContentTypeDefault == 'text/html' ? $t('settings.instance_default_simple') : ''}}
+                    </option>
+                    <option value="text/markdown">
+                      Markdown
+                      {{postContentTypeDefault == 'text/markdown' ? $t('settings.instance_default_simple') : ''}}
+                    </option>
+                  </select>
+                  <i class="icon-down-open"/>
+                </label>
+              </div>
+            </li>
          </ul>
        </div>

--- a/src/components/status/status.vue
+++ b/src/components/status/status.vue
@ -16,9 +16,8 @@
        <UserAvatar v-if="retweet" :betterShadow="betterShadow" :src="statusoid.user.profile_image_url_original"/>
        <div class="media-body faint">
          <span class="user-name">
-            <router-link :to="retweeterProfileLink">
-              {{retweeterHtml || retweeter}}
-            </router-link>
+            <router-link v-if="retweeterHtml" :to="retweeterProfileLink" v-html="retweeterHtml"/>
+            <router-link v-else :to="retweeterProfileLink">{{retweeter}}</router-link>
          </span>
          <i class='fa icon-retweet retweeted' :title="$t('tool_tip.repeat')"></i>
          {{$t('timeline.repeated')}}
--- a/src/components/tab_switcher/tab_switcher.js
+++ b/src/components/tab_switcher/tab_switcher.js
@ -37,7 +37,7 @@ export default Vue.component('tab-switcher', {

            return (
              <div class={ classesWrapper.join(' ')}>
-                <button onClick={this.activateTab(index)} class={ classesTab.join(' ') }>{slot.data.attrs.label}</button>
+                <button disabled={slot.data.attrs.disabled} onClick={this.activateTab(index)} class={ classesTab.join(' ') }>{slot.data.attrs.label}</button>
              </div>
            )
          })
--- a/src/components/user_card_content/user_card_content.js
+++ b/src/components/user_card_content/user_card_content.js
@ -79,6 +79,12 @@ export default {
      set (color) {
        this.$store.dispatch('setHighlight', { user: this.user.screen_name, color })
      }
+    },
+    visibleRole () {
+      const validRole = (this.user.role === 'admin' || this.user.role === 'moderator')
+      const showRole = this.isOtherUser || this.user.show_role
+
+      return validRole && showRole && this.user.role
    }
  },
  components: {
--- a/src/components/user_card_content/user_card_content.vue
+++ b/src/components/user_card_content/user_card_content.vue
@ -19,7 +19,9 @@
          </div>

          <router-link class='user-screen-name' :to="userProfileLink(user)">
-            <span class="handle">@{{user.screen_name}}</span><span v-if="user.locked"><i class="icon icon-lock"></i></span>
+            <span class="handle">@{{user.screen_name}}
+              <span class="alert staff" v-if="!hideBio && !!visibleRole">{{visibleRole}}</span>
+            </span><span v-if="user.locked"><i class="icon icon-lock"></i></span>
            <span v-if="!hideUserStatsLocal && !hideBio" class="dailyAvg">{{dailyAvg}} {{ $t('user_card.per_day') }}</span>
          </router-link>
        </div>
@ -247,6 +249,15 @@
      text-overflow: ellipsis;
      overflow: hidden;
    }
+
+    // TODO use proper colors
+    .staff {
+      text-transform: capitalize;
+      color: $fallback--text;
+      color: var(--btnText, $fallback--text);
+      background-color: $fallback--fg;
+      background-color: var(--btn, $fallback--fg);
+    }
  }

  .user-meta {
--- a/src/components/user_profile/user_profile.js
+++ b/src/components/user_profile/user_profile.js
@ -58,6 +58,12 @@ const UserProfile = {
    },
    isExternal () {
      return this.$route.name === 'external-user-profile'
+    },
+    followsTabVisible () {
+      return this.isUs || !this.user.hide_follows
+    },
+    followersTabVisible () {
+      return this.isUs || !this.user.hide_followers
    }
  },
  methods: {
--- a/src/components/user_profile/user_profile.vue
+++ b/src/components/user_profile/user_profile.vue
@ -9,19 +9,20 @@
    <tab-switcher :renderOnlyFocused="true">
      <Timeline
        :label="$t('user_card.statuses')"
+        :disabled="!user.statuses_count"
        :embedded="true"
        :title="$t('user_profile.timeline_title')"
        :timeline="timeline"
        :timeline-name="'user'"
        :user-id="fetchBy"
      />
-      <div :label="$t('user_card.followees')">
+      <div :label="$t('user_card.followees')" v-if="followsTabVisible" :disabled="!user.friends_count">
        <FollowList v-if="user.friends_count > 0" :userId="userId" :showFollowers="false" />
        <div class="userlist-placeholder" v-else>
          <i class="icon-spin3 animate-spin"></i>
        </div>
      </div>
-      <div :label="$t('user_card.followers')">
+      <div :label="$t('user_card.followers')" v-if="followersTabVisible" :disabled="!user.followers_count">
        <FollowList v-if="user.followers_count > 0" :userId="userId" :showFollowers="true" />
        <div class="userlist-placeholder" v-else>
          <i class="icon-spin3 animate-spin"></i>
@ -29,6 +30,7 @@
      </div>
      <Timeline
        :label="$t('user_card.media')"
+        :disabled="!media.visibleStatuses.length"
        :embedded="true" :title="$t('user_card.media')"
        timeline-name="media"
        :timeline="media"
@ -37,6 +39,7 @@
      <Timeline
        v-if="isUs"
        :label="$t('user_card.favorites')"
+        :disabled="!favorites.visibleStatuses.length"
        :embedded="true"
        :title="$t('user_card.favorites')"
        timeline-name="favorites"
--- a/src/components/user_settings/user_settings.js
+++ b/src/components/user_settings/user_settings.js
@ -14,6 +14,8 @@ const UserSettings = {
      newDefaultScope: this.$store.state.users.currentUser.default_scope,
      hideFollows: this.$store.state.users.currentUser.hide_follows,
      hideFollowers: this.$store.state.users.currentUser.hide_followers,
+      showRole: this.$store.state.users.currentUser.show_role,
+      role: this.$store.state.users.currentUser.role,
      followList: null,
      followImportError: false,
      followsImported: false,
@ -71,6 +73,8 @@ const UserSettings = {
      const no_rich_text = this.newNoRichText
      const hide_follows = this.hideFollows
      const hide_followers = this.hideFollowers
+      const show_role = this.showRole
+
      /* eslint-enable camelcase */
      this.$store.state.api.backendInteractor
        .updateProfile({
@ -83,7 +87,8 @@ const UserSettings = {
            default_scope,
            no_rich_text,
            hide_follows,
-            hide_followers
+            hide_followers,
+            show_role
            /* eslint-enable camelcase */
          }}).then((user) => {
            if (!user.error) {
@ -238,7 +243,9 @@ const UserSettings = {
    exportFollows () {
      this.enableFollowsExport = false
      this.$store.state.api.backendInteractor
-        .fetchFriends({id: this.$store.state.users.currentUser.id})
+        .exportFriends({
+          id: this.$store.state.users.currentUser.id
+        })
        .then((friendList) => {
          this.exportPeople(friendList, 'friends.csv')
          setTimeout(() => { this.enableFollowsExport = true }, 2000)
--- a/src/components/user_settings/user_settings.vue
+++ b/src/components/user_settings/user_settings.vue
@ -37,6 +37,11 @@
              <input type="checkbox" v-model="hideFollowers" id="account-hide-followers">
              <label for="account-hide-followers">{{$t('settings.hide_followers_description')}}</label>
            </p>
+            <p>
+              <input type="checkbox" v-model="showRole" id="account-show-role">
+              <label for="account-show-role" v-if="role === 'admin'">{{$t('settings.show_admin_badge')}}</label>
+              <label for="account-show-role" v-if="role === 'moderator'">{{$t('settings.show_moderator_badge')}}</label>
+            </p>
            <button :disabled='newName && newName.length === 0' class="btn btn-default" @click="updateProfile">{{$t('general.submit')}}</button>
          </div>
          <div class="setting-item">
--- a/src/i18n/en.json
+++ b/src/i18n/en.json
@ -28,7 +28,8 @@
    "password": "Password",
    "placeholder": "e.g. lain",
    "register": "Register",
-    "username": "Username"
+    "username": "Username",
+    "hint": "Log in to join the discussion"
  },
  "nav": {
    "about": "About",
@ -166,6 +167,8 @@
    "no_rich_text_description": "Strip rich text formatting from all posts",
    "hide_follows_description": "Don't show who I'm following",
    "hide_followers_description": "Don't show who's following me",
+    "show_admin_badge": "Show Admin badge in my profile",
+    "show_moderator_badge": "Show Moderator badge in my profile",
    "nsfw_clickthrough": "Enable clickthrough NSFW attachment hiding",
    "panelRadius": "Panels",
    "pause_on_unfocused": "Pause streaming when tab is not focused",
@ -192,6 +195,8 @@
    "subject_line_email": "Like email: \"re: subject\"",
    "subject_line_mastodon": "Like mastodon: copy as is",
    "subject_line_noop": "Do not copy",
+    "post_status_content_type": "Post status content type",
+    "status_content_type_plain": "Plain text",
    "stop_gifs": "Play-on-hover GIFs",
    "streaming": "Enable automatic streaming of new posts when scrolled to the top",
    "text": "Text",
--- a/src/i18n/ru.json
+++ b/src/i18n/ru.json
@ -129,6 +129,8 @@
    "no_rich_text_description": "Убрать форматирование из всех постов",
    "hide_follows_description": "Не показывать кого я читаю",
    "hide_followers_description": "Не показывать кто читает меня",
+    "show_admin_badge": "Показывать значок администратора в моем профиле",
+    "show_moderator_badge": "Показывать значок модератора в моем профиле",
    "nsfw_clickthrough": "Включить скрытие NSFW вложений",
    "panelRadius": "Панели",
    "pause_on_unfocused": "Приостановить загрузку когда вкладка не в фокусе",
--- a/src/modules/config.js
+++ b/src/modules/config.js
@ -30,7 +30,13 @@ const defaultState = {
  interfaceLanguage: browserLocale,
  scopeCopy: undefined, // instance default
  subjectLineBehavior: undefined, // instance default
+<<<<<<< HEAD
  alwaysShowSubjectInput: undefined // instance default
+=======
+  alwaysShowSubjectInput: undefined, // instance default
+  showFeaturesPanel: true,
+  postContentType: undefined // instance default
+>>>>>>> da0a5535eb09f6637df921a8a5f951c295bedeac
 }

 const config = {
--- a/src/modules/instance.js
+++ b/src/modules/instance.js
@ -24,6 +24,7 @@ const defaultState = {
  disableChat: false,
  scopeCopy: true,
  subjectLineBehavior: 'email',
+  postContentType: 'text/plain',
  loginMethod: 'password',
  nsfwCensorImage: undefined,
  vapidPublicKey: undefined,
--- a/src/services/api/api.service.js
+++ b/src/services/api/api.service.js
@ -130,7 +130,7 @@ const updateBanner = ({credentials, params}) => {
 // description
 const updateProfile = ({credentials, params}) => {
  // Always include these fields, because they might be empty or false
-  const fields = ['description', 'locked', 'no_rich_text', 'hide_follows', 'hide_followers']
+  const fields = ['description', 'locked', 'no_rich_text', 'hide_follows', 'hide_followers', 'show_role']
  let url = PROFILE_UPDATE_URL

  const form = new FormData()
@ -257,6 +257,13 @@ const fetchFriends = ({id, page, credentials}) => {
    .then((data) => data.map(parseUser))
 }

+const exportFriends = ({id, credentials}) => {
+  let url = `${FRIENDS_URL}?user_id=${id}&export=true`
+  return fetch(url, { headers: authHeaders(credentials) })
+    .then((data) => data.json())
+    .then((data) => data.map(parseUser))
+}
+
 const fetchFollowers = ({id, page, credentials}) => {
  let url = `${FOLLOWERS_URL}?user_id=${id}`
  if (page) {
@ -536,6 +543,7 @@ const apiService = {
  fetchConversation,
  fetchStatus,
  fetchFriends,
+  exportFriends,
  fetchFollowers,
  followUser,
  unfollowUser,
--- a/src/services/backend_interactor_service/backend_interactor_service.js
+++ b/src/services/backend_interactor_service/backend_interactor_service.js
@ -14,6 +14,10 @@ const backendInteractorService = (credentials) => {
    return apiService.fetchFriends({id, page, credentials})
  }

+  const exportFriends = ({id}) => {
+    return apiService.exportFriends({id, credentials})
+  }
+
  const fetchFollowers = ({id, page}) => {
    return apiService.fetchFollowers({id, page, credentials})
  }
@ -78,6 +82,7 @@ const backendInteractorService = (credentials) => {
    fetchStatus,
    fetchConversation,
    fetchFriends,
+    exportFriends,
    fetchFollowers,
    followUser,
    unfollowUser,
--- a/src/services/entity_normalizer/entity_normalizer.service.js
+++ b/src/services/entity_normalizer/entity_normalizer.service.js
@ -90,6 +90,8 @@ export const parseUser = (data) => {
    output.statusnet_blocking = data.statusnet_blocking

    output.is_local = data.is_local
+    output.role = data.role
+    output.show_role = data.show_role

    output.follows_you = data.follows_you

--- a/static/config.json
+++ b/static/config.json
@ -13,6 +13,7 @@
  "collapseMessageWithSubject": false,
  "scopeCopy": true,
  "subjectLineBehavior": "email",
+  "postContentType": "text/plain",
  "alwaysShowSubjectInput": true,
  "hidePostStats": false,
  "hideUserStats": false,
--- a/static/emoji.json
+++ b/static/emoji.json