+
{{ $t('emoji.keep_open') }}
diff --git a/src/components/extra_buttons/extra_buttons.js b/src/components/extra_buttons/extra_buttons.js
index 4bc6144c..5eb98264 100644
--- a/src/components/extra_buttons/extra_buttons.js
+++ b/src/components/extra_buttons/extra_buttons.js
@@ -144,6 +144,7 @@ const ExtraButtons = {
statusPoll: this.status.poll,
statusFiles: [...this.status.attachments],
statusScope: this.status.visibility,
+ statusLanguage: this.status.language,
statusContentType: data.content_type
}))
this.doDeleteStatus()
diff --git a/src/components/followed_tag_card/FollowedTagCard.vue b/src/components/followed_tag_card/FollowedTagCard.vue
new file mode 100644
index 00000000..d9394ddc
--- /dev/null
+++ b/src/components/followed_tag_card/FollowedTagCard.vue
@@ -0,0 +1,77 @@
+
+
-
-
+
+
-
+
{
+ .catch((e) => {
+ console.error(e)
this.loading = false
this.error = true
})
@@ -88,7 +89,7 @@ const withLoadMore = ({
const children = this.$slots
return (
+
+
+ #{{ tag.name }}
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/components/pinch_zoom/pinch_zoom.js b/src/components/pinch_zoom/pinch_zoom.js
index 82670ddf..b7e8f673 100644
--- a/src/components/pinch_zoom/pinch_zoom.js
+++ b/src/components/pinch_zoom/pinch_zoom.js
@@ -1,4 +1,4 @@
-import PinchZoom from '@kazvmoe-infra/pinch-zoom-element'
+import PinchZoom from '@floatingghost/pinch-zoom-element'
export default {
methods: {
diff --git a/src/components/post_status_form/post_status_form.js b/src/components/post_status_form/post_status_form.js
index d7788414..b8539395 100644
--- a/src/components/post_status_form/post_status_form.js
+++ b/src/components/post_status_form/post_status_form.js
@@ -13,6 +13,7 @@ import suggestor from '../emoji_input/suggestor.js'
import { mapGetters, mapState } from 'vuex'
import Checkbox from '../checkbox/checkbox.vue'
import Select from '../select/select.vue'
+import iso6391 from 'iso-639-1'
import { library } from '@fortawesome/fontawesome-svg-core'
import {
@@ -63,6 +64,7 @@ const PostStatusForm = {
'statusMediaDescriptions',
'statusScope',
'statusContentType',
+ 'statusLanguage',
'replyTo',
'quoteId',
'repliedUser',
@@ -128,7 +130,7 @@ const PostStatusForm = {
statusText = buildMentionsString({ user: this.repliedUser, attentions: this.attentions }, currentUser)
}
- const { postContentType: contentType, sensitiveByDefault, sensitiveIfSubject } = this.$store.getters.mergedConfig
+ const { postContentType: contentType, sensitiveByDefault, sensitiveIfSubject, interfaceLanguage } = this.$store.getters.mergedConfig
let statusParams = {
spoilerText: this.subject || '',
@@ -139,6 +141,7 @@ const PostStatusForm = {
poll: {},
mediaDescriptions: {},
visibility: this.suggestedVisibility(),
+ language: interfaceLanguage,
contentType
}
@@ -153,6 +156,7 @@ const PostStatusForm = {
poll: this.statusPoll || {},
mediaDescriptions: this.statusMediaDescriptions || {},
visibility: this.statusScope || this.suggestedVisibility(),
+ language: this.statusLanguage || interfaceLanguage,
contentType: statusContentType
}
}
@@ -259,7 +263,10 @@ const PostStatusForm = {
...mapGetters(['mergedConfig']),
...mapState({
mobileLayout: state => state.interface.mobileLayout
- })
+ }),
+ isoLanguages () {
+ return iso6391.getAllCodes();
+ }
},
watch: {
'newStatus': {
@@ -282,6 +289,7 @@ const PostStatusForm = {
files: [],
visibility: newStatus.visibility,
contentType: newStatus.contentType,
+ language: newStatus.language,
poll: {},
mediaDescriptions: {}
}
@@ -341,6 +349,7 @@ const PostStatusForm = {
inReplyToStatusId: this.replyTo,
quoteId: this.quoteId,
contentType: newStatus.contentType,
+ language: newStatus.language,
poll,
idempotencyKey: this.idempotencyKey
}
@@ -375,6 +384,7 @@ const PostStatusForm = {
inReplyToStatusId: this.replyTo,
quoteId: this.quoteId,
contentType: newStatus.contentType,
+ language: newStatus.language,
poll: {},
preview: true
}).then((data) => {
diff --git a/src/components/post_status_form/post_status_form.vue b/src/components/post_status_form/post_status_form.vue
index 9a051262..c2f8917f 100644
--- a/src/components/post_status_form/post_status_form.vue
+++ b/src/components/post_status_form/post_status_form.vue
@@ -194,6 +194,23 @@
:on-scope-change="changeVis"
/>
+
+
+
+
+
+ {{ $t('settings.use_blurhash') }}
+
+
state.users.currentUser,
privateMode: state => state.instance.private,
federating: state => state.instance.federating,
- showBubbleTimeline: state => (state.instance.localBubbleInstances.length > 0),
- restrictedTimelines: state => state.instance.restrict_unauthenticated.timelines
+ showBubbleTimeline: state => (state.instance.localBubbleInstances.length > 0)
})
}
}
diff --git a/src/components/timeline_menu/timeline_menu_content.vue b/src/components/timeline_menu/timeline_menu_content.vue
index 220b0278..27aece22 100644
--- a/src/components/timeline_menu/timeline_menu_content.vue
+++ b/src/components/timeline_menu/timeline_menu_content.vue
@@ -32,7 +32,7 @@
>{{ $t("nav.bubble_timeline") }}
-
+
{{ $t("nav.public_tl") }}
-
+
$store.dispatch('fetchFollowedTags', props.userId),
+ select: (props, $store) => get($store.getters.findUser(props.userId), 'followedTagIds', []).map(id => $store.getters.findTag(id)),
+ destroy: (props, $store) => $store.dispatch('clearFollowedTags', props.userId),
+ childPropName: 'items',
+ additionalPropNames: ['userId']
+})(List)
+
const isUserPage = ({ name }) => name === 'user-profile' || name === 'external-user-profile'
const UserProfile = {
@@ -41,6 +52,7 @@ const UserProfile = {
error: false,
userId: null,
tab: 'statuses',
+ followsTab: 'users',
footerRef: null,
note: null,
noteLoading: false
@@ -165,6 +177,9 @@ const UserProfile = {
this.tab = tab
this.$router.replace({ hash: `#${tab}` })
},
+ onFollowsTabSwitch (tab) {
+ this.followsTab = tab
+ },
linkClicked ({ target }) {
if (target.tagName === 'SPAN') {
target = target.parentNode
@@ -200,6 +215,7 @@ const UserProfile = {
}
},
components: {
+ FollowedTagCard,
UserCard,
Timeline,
FollowerList,
@@ -207,7 +223,8 @@ const UserProfile = {
FollowCard,
TabSwitcher,
Conversation,
- RichContent
+ RichContent,
+ FollowedTagList,
}
}
diff --git a/src/components/user_profile/user_profile.vue b/src/components/user_profile/user_profile.vue
index d16483e2..5465778a 100644
--- a/src/components/user_profile/user_profile.vue
+++ b/src/components/user_profile/user_profile.vue
@@ -37,6 +37,15 @@
:html="field.value"
:emoji="user.emoji"
/>
+
@@ -95,22 +104,48 @@
v-if="followsTabVisible"
key="followees"
:label="$t('user_card.followees')"
- :disabled="!user.friends_count"
>
-
+
+
+
+
+
+
+
+
+
+
-
+
{children}
diff --git a/src/i18n/en.json b/src/i18n/en.json
index 32785561..534f1c1c 100644
--- a/src/i18n/en.json
+++ b/src/i18n/en.json
@@ -939,6 +939,7 @@
"title": "Version"
},
"virtual_scrolling": "Optimize timeline rendering",
+ "use_blurhash": "Use blurhashes for NSFW thumbnails",
"word_filter": "Word filter",
"wordfilter": "Wordfilter"
},
@@ -1056,6 +1057,7 @@
"show_new": "Show new",
"socket_broke": "Realtime connection lost: CloseEvent code {0}",
"socket_reconnected": "Realtime connection established",
+ "follow_tag": "Follow hashtag",
"unfollow_tag": "Unfollow hashtag",
"up_to_date": "Up-to-date"
},
@@ -1138,6 +1140,8 @@
"follow_unfollow": "Unfollow",
"followees": "Following",
"followers": "Followers",
+ "followed_tags": "Followed hashtags",
+ "followed_users": "Followed users",
"following": "Following!",
"follows_you": "Follows you!",
"hidden": "Hidden",
@@ -1176,6 +1180,9 @@
"unfollow_confirm_accept_button": "Yes, unfollow",
"unfollow_confirm_cancel_button": "No, don't unfollow",
"unfollow_confirm_title": "Unfollow user",
+ "not_following_any_hashtags": "You are not following any hashtags",
+ "follow_tag": "Follow hashtag",
+ "unfollow_tag": "Unfollow hashtag",
"unmute": "Unmute",
"unmute_progress": "Unmuting…",
"unsubscribe": "Unsubscribe"
@@ -1183,7 +1190,8 @@
"user_profile": {
"profile_does_not_exist": "Sorry, this profile does not exist.",
"profile_loading_error": "Sorry, there was an error loading this profile.",
- "timeline_title": "User timeline"
+ "timeline_title": "User timeline",
+ "field_validated": "Link Verified"
},
"user_reporting": {
"add_comment_description": "The report will be sent to your instance moderators. You can provide an explanation of why you are reporting this account below:",
diff --git a/src/modules/config.js b/src/modules/config.js
index 43b4f802..3f2d4eb8 100644
--- a/src/modules/config.js
+++ b/src/modules/config.js
@@ -121,7 +121,8 @@ export const defaultState = {
maxDepthInThread: undefined, // instance default
translationLanguage: undefined, // instance default,
supportedTranslationLanguages: {}, // instance default
- userProfileDefaultTab: 'statuses'
+ userProfileDefaultTab: 'statuses',
+ useBlurhash: true,
}
// caching the instance default properties
diff --git a/src/modules/interface.js b/src/modules/interface.js
index ae1a31c3..33528c0d 100644
--- a/src/modules/interface.js
+++ b/src/modules/interface.js
@@ -186,7 +186,7 @@ const interfaceMod = {
if (thirdColumnMode === 'none' || !rootState.users.currentUser) {
commit('setLayoutType', normalOrMobile)
} else {
- const wideLayout = width >= 1300
+ const wideLayout = width >= 1280
commit('setLayoutType', wideLayout ? 'wide' : normalOrMobile)
}
},
diff --git a/src/modules/tags.js b/src/modules/tags.js
index cff54b7d..63f6888d 100644
--- a/src/modules/tags.js
+++ b/src/modules/tags.js
@@ -2,9 +2,15 @@ import { merge } from 'lodash'
const tags = {
state: {
- // Contains key = id, value = number of trackers for this poll
+ // Contains key = name, value = tag json
tags: {}
},
+ getters: {
+ findTag: state => query => {
+ const result = state.tags[query]
+ return result
+ },
+ },
mutations: {
setTag (state, { name, data }) {
state.tags[name] = data
@@ -17,17 +23,17 @@ const tags = {
return tag
})
},
- followTag (store, tagName) {
- return store.rootState.api.backendInteractor.followHashtag({ tag: tagName })
+ followTag ({ rootState, commit }, tagName) {
+ return rootState.api.backendInteractor.followHashtag({ tag: tagName })
.then((resp) => {
- store.commit('setTag', { name: tagName, data: resp })
+ commit('setTag', { name: tagName, data: resp })
return resp
})
},
- unfollowTag ({ rootState, commit }, tag) {
- return rootState.api.backendInteractor.unfollowHashtag({ tag })
+ unfollowTag ({ rootState, commit }, tagName) {
+ return rootState.api.backendInteractor.unfollowHashtag({ tag: tagName })
.then((resp) => {
- commit('setTag', { name: tag, data: resp })
+ commit('setTag', { name: tagName, data: resp })
return resp
})
}
diff --git a/src/modules/users.js b/src/modules/users.js
index 5e15d3ce..742219ba 100644
--- a/src/modules/users.js
+++ b/src/modules/users.js
@@ -5,9 +5,9 @@ import { compact, map, each, mergeWith, last, concat, uniq, isArray } from 'loda
import { registerPushNotifications, unregisterPushNotifications } from '../services/push/push.js'
// TODO: Unify with mergeOrAdd in statuses.js
-export const mergeOrAdd = (arr, obj, item) => {
+export const mergeOrAdd = (arr, obj, item, key = 'id') => {
if (!item) { return false }
- const oldItem = obj[item.id]
+ const oldItem = obj[item[key]]
if (oldItem) {
// We already have this, so only merge the new info.
mergeWith(oldItem, item, mergeArrayLength)
@@ -15,7 +15,7 @@ export const mergeOrAdd = (arr, obj, item) => {
} else {
// This is a new item, prepare it
arr.push(item)
- obj[item.id] = item
+ obj[item[key]] = item
if (item.screen_name && !item.screen_name.includes('@')) {
obj[item.screen_name.toLowerCase()] = item
}
@@ -157,6 +157,14 @@ export const mutations = {
const user = state.usersObject[id]
user.followerIds = uniq(concat(user.followerIds || [], followerIds))
},
+ saveFollowedTagIds (state, { id, followedTagIds }) {
+ const user = state.usersObject[id]
+ user.followedTagIds = uniq(concat(user.followedTagIds || [], followedTagIds))
+ },
+ saveFollowedTagPagination (state, { id, pagination }) {
+ const user = state.usersObject[id]
+ user.followedTagPagination = pagination
+ },
// Because frontend doesn't have a reason to keep these stuff in memory
// outside of viewing someones user profile.
clearFriends (state, userId) {
@@ -171,6 +179,12 @@ export const mutations = {
user['followerIds'] = []
}
},
+ clearFollowedTags (state, userId) {
+ const user = state.usersObject[userId]
+ if (user) {
+ user['followedTagIds'] = []
+ }
+ },
addNewUsers (state, users) {
each(users, (user) => {
if (user.relationship) {
@@ -277,7 +291,7 @@ export const getters = {
relationship: state => id => {
const rel = id && state.relationships[id]
return rel || { id, loading: true }
- }
+ },
}
export const defaultState = {
@@ -288,7 +302,9 @@ export const defaultState = {
usersObject: {},
signUpPending: false,
signUpErrors: [],
- relationships: {}
+ relationships: {},
+ tags: [],
+ tagsObject: {}
}
const users = {
@@ -408,12 +424,27 @@ const users = {
return followers
})
},
+ fetchFollowedTags ({ rootState, commit }, id) {
+ const user = rootState.users.usersObject[id]
+ const pagination = user.followedTagPagination
+
+ return rootState.api.backendInteractor.getFollowedHashtags({ pagination })
+ .then(({ data: tags, pagination }) => {
+ each(tags, tag => commit('setTag', { name: tag.name, data: tag }))
+ commit('saveFollowedTagIds', { id, followedTagIds: tags.map(tag => tag.name) })
+ commit('saveFollowedTagPagination', { id, pagination })
+ return tags
+ })
+ },
clearFriends ({ commit }, userId) {
commit('clearFriends', userId)
},
clearFollowers ({ commit }, userId) {
commit('clearFollowers', userId)
},
+ clearFollowedTags ({ commit }, userId) {
+ commit('clearFollowedTags', userId)
+ },
subscribeUser ({ rootState, commit }, id) {
return rootState.api.backendInteractor.subscribeUser({ id })
.then((relationship) => commit('updateUserRelationship', [relationship]))
diff --git a/src/services/api/api.service.js b/src/services/api/api.service.js
index 21c4b25b..0f8b75a4 100644
--- a/src/services/api/api.service.js
+++ b/src/services/api/api.service.js
@@ -1,6 +1,7 @@
import { each, map, concat, last, get } from 'lodash'
import { parseStatus, parseSource, parseUser, parseNotification, parseReport, parseAttachment, parseLinkHeaderPagination } from '../entity_normalizer/entity_normalizer.service.js'
import { RegistrationError, StatusCodeError } from '../errors/errors'
+import { Url } from 'url'
/* eslint-env browser */
const MUTES_IMPORT_URL = '/api/pleroma/mutes_import'
@@ -111,6 +112,7 @@ const AKKOMA_SETTING_PROFILE_LIST = `/api/v1/akkoma/frontend_settings/pleroma-fe
const MASTODON_TAG_URL = (name) => `/api/v1/tags/${name}`
const MASTODON_FOLLOW_TAG_URL = (name) => `/api/v1/tags/${name}/follow`
const MASTODON_UNFOLLOW_TAG_URL = (name) => `/api/v1/tags/${name}/unfollow`
+const MASTODON_FOLLOWED_TAGS_URL = '/api/v1/followed_tags'
const oldfetch = window.fetch
@@ -878,7 +880,8 @@ const postStatus = ({
quoteId,
contentType,
preview,
- idempotencyKey
+ idempotencyKey,
+ language
}) => {
const form = new FormData()
const pollOptions = poll.options || []
@@ -889,6 +892,7 @@ const postStatus = ({
if (visibility) form.append('visibility', visibility)
if (sensitive) form.append('sensitive', sensitive)
if (contentType) form.append('content_type', contentType)
+ if (language) form.append('language', language)
mediaIds.forEach(val => {
form.append('media_ids[]', val)
})
@@ -1575,6 +1579,28 @@ const unfollowHashtag = ({ tag, credentials }) => {
})
}
+const getFollowedHashtags = ({ credentials, pagination: savedPagination }) => {
+ const queryParams = new URLSearchParams()
+ if (savedPagination?.maxId) {
+ queryParams.append('max_id', savedPagination.maxId)
+ }
+ const url = `${MASTODON_FOLLOWED_TAGS_URL}?${queryParams.toString()}`
+ let pagination = {};
+ return fetch(url, {
+ credentials
+ }).then((data) => {
+ pagination = parseLinkHeaderPagination(data.headers.get('Link'), {
+ flakeId: false
+ });
+ return data.json()
+ }).then((data) => {
+ return {
+ pagination,
+ data
+ }
+ });
+}
+
export const getMastodonSocketURI = ({ credentials, stream, args = {} }) => {
return Object.entries({
...(credentials
@@ -1813,7 +1839,8 @@ const apiService = {
deleteNoteFromReport,
getHashtag,
followHashtag,
- unfollowHashtag
+ unfollowHashtag,
+ getFollowedHashtags,
}
export default apiService
diff --git a/src/services/entity_normalizer/entity_normalizer.service.js b/src/services/entity_normalizer/entity_normalizer.service.js
index 465d6fad..c54ce3e2 100644
--- a/src/services/entity_normalizer/entity_normalizer.service.js
+++ b/src/services/entity_normalizer/entity_normalizer.service.js
@@ -68,13 +68,15 @@ export const parseUser = (data) => {
output.fields_html = data.fields.map(field => {
return {
name: escape(field.name),
- value: field.value
+ value: field.value,
+ verified_at: field.verified_at
}
})
output.fields_text = data.fields.map(field => {
return {
name: unescape(field.name.replace(/<[^>]*>/g, '')),
- value: unescape(field.value.replace(/<[^>]*>/g, ''))
+ value: unescape(field.value.replace(/<[^>]*>/g, '')),
+ verified_at: field.verified_at
}
})
@@ -232,13 +234,14 @@ export const parseAttachment = (data) => {
if (masto) {
// Not exactly same...
output.mimetype = data.pleroma ? data.pleroma.mime_type : data.type
- output.meta = data.meta // not present in BE yet
+ output.meta = data.meta
output.id = data.id
} else {
output.mimetype = data.mimetype
// output.meta = ??? missing
}
+ output.blurhash = data.blurhash
output.url = data.url
output.large_thumb_url = data.preview_url
output.description = data.description
@@ -408,8 +411,10 @@ export const parseNotification = (data) => {
if (masto) {
output.type = mastoDict[data.type] || data.type
output.seen = data.pleroma.is_seen
- output.status = isStatusNotification(output.type) ? parseStatus(data.status) : null
- output.action = output.status // TODO: Refactor, this is unneeded
+ if (data.status) {
+ output.status = isStatusNotification(output.type) ? parseStatus(data.status) : null
+ output.action = output.status // TODO: Refactor, this is unneeded
+ }
output.target = output.type !== 'move'
? null
: parseUser(data.target)
diff --git a/src/services/status_poster/status_poster.service.js b/src/services/status_poster/status_poster.service.js
index aaef5a7a..0dbedf07 100644
--- a/src/services/status_poster/status_poster.service.js
+++ b/src/services/status_poster/status_poster.service.js
@@ -13,7 +13,8 @@ const postStatus = ({
quoteId = undefined,
contentType = 'text/plain',
preview = false,
- idempotencyKey = ''
+ idempotencyKey = '',
+ language
}) => {
const mediaIds = map(media, 'id')
@@ -29,7 +30,8 @@ const postStatus = ({
contentType,
poll,
preview,
- idempotencyKey
+ idempotencyKey,
+ language
})
.then((data) => {
if (!data.error && !preview) {
diff --git a/src/services/style_setter/style_setter.js b/src/services/style_setter/style_setter.js
index d5bf8749..9e691261 100644
--- a/src/services/style_setter/style_setter.js
+++ b/src/services/style_setter/style_setter.js
@@ -4,12 +4,10 @@ import { getColors, computeDynamicColor, getOpacitySlot } from '../theme_data/th
export const applyTheme = (input) => {
const { rules } = generatePreset(input)
- const head = document.head
const body = document.body
body.classList.add('hidden')
- const styleEl = document.createElement('style')
- head.appendChild(styleEl)
+ const styleEl = document.getElementById('theme-holder')
const styleSheet = styleEl.sheet
styleSheet.toString()
diff --git a/static/.tos b/static/.tos
deleted file mode 100644
index 4d91f9b0..00000000
--- a/static/.tos
+++ /dev/null
@@ -1,45 +0,0 @@
-
-
diff --git a/static/blurhash-overlay.png b/static/blurhash-overlay.png
new file mode 100755
index 00000000..209a9438
Binary files /dev/null and b/static/blurhash-overlay.png differ
diff --git a/static/logo.png b/static/logo.png
deleted file mode 100644
index 14aaf4a3..00000000
Binary files a/static/logo.png and /dev/null differ
diff --git a/static/theme-holder.css b/static/theme-holder.css
new file mode 100644
index 00000000..3e884036
--- /dev/null
+++ b/static/theme-holder.css
@@ -0,0 +1 @@
+// This file intentionally left blank
diff --git a/yarn.lock b/yarn.lock
index bbceba0b..7027b7d8 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1350,6 +1350,13 @@
minimatch "^3.0.4"
strip-json-comments "^3.1.1"
+"@floatingghost/pinch-zoom-element@^1.3.1":
+ version "1.3.1"
+ resolved "https://registry.yarnpkg.com/@floatingghost/pinch-zoom-element/-/pinch-zoom-element-1.3.1.tgz#5f327ad17ddf1f56777098aca088fdbf99cbd049"
+ integrity sha512-KnE7aBQdd/Fj1TzU5uzgwD9YAQ58DTMUks/PoTEBFW4zi0lBM9cN/j45wzcnzsT2VXG1S6qM7NMmq7NGm2//Fg==
+ dependencies:
+ pointer-tracker "^2.0.3"
+
"@fortawesome/fontawesome-common-types@6.2.0":
version "6.2.0"
resolved "https://registry.npmjs.org/@fortawesome/fontawesome-common-types/-/fontawesome-common-types-6.2.0.tgz"
@@ -1516,13 +1523,6 @@
"@jridgewell/resolve-uri" "^3.0.3"
"@jridgewell/sourcemap-codec" "^1.4.10"
-"@kazvmoe-infra/pinch-zoom-element@1.2.0":
- version "1.2.0"
- resolved "https://registry.npmjs.org/@kazvmoe-infra/pinch-zoom-element/-/pinch-zoom-element-1.2.0.tgz"
- integrity sha512-HBrhH5O/Fsp2bB7EGTXzCsBAVcMjknSagKC5pBdGpKsF8meHISR0kjDIdw4YoE0S+0oNMwJ6ZUZyIBrdywxPPw==
- dependencies:
- pointer-tracker "^2.0.3"
-
"@nicolo-ribaudo/eslint-scope-5-internals@5.1.1-v1":
version "5.1.1-v1"
resolved "https://registry.yarnpkg.com/@nicolo-ribaudo/eslint-scope-5-internals/-/eslint-scope-5-internals-5.1.1-v1.tgz#dbf733a965ca47b1973177dc0bb6c889edcfb129"
@@ -2494,6 +2494,11 @@ binary-extensions@^2.0.0:
resolved "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.2.0.tgz"
integrity sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA==
+blurhash@^2.0.4:
+ version "2.0.4"
+ resolved "https://registry.yarnpkg.com/blurhash/-/blurhash-2.0.4.tgz#60642a823b50acaaf3732ddb6c7dfd721bdfef2a"
+ integrity sha512-r/As72u2FbucLoK5NTegM/GucxJc3d8GvHc4ngo13IO/nt2HU4gONxNLq1XPN6EM/V8Y9URIa7PcSz2RZu553A==
+
body-parser@1.19.2:
version "1.19.2"
resolved "https://registry.npmjs.org/body-parser/-/body-parser-1.19.2.tgz"
@@ -5090,9 +5095,9 @@ isexe@^2.0.0:
resolved "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz"
integrity sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==
-iso-639-1@2.1.15:
+iso-639-1@^2.1.15:
version "2.1.15"
- resolved "https://registry.npmjs.org/iso-639-1/-/iso-639-1-2.1.15.tgz"
+ resolved "https://registry.yarnpkg.com/iso-639-1/-/iso-639-1-2.1.15.tgz#20cf78a4f691aeb802c16f17a6bad7d99271e85d"
integrity sha512-7c7mBznZu2ktfvyT582E2msM+Udc1EjOyhVRE/0ZsjD9LBtWSm23h3PtiRh2a35XoUsTQQjJXaJzuLjXsOdFDg==
isobject@^3.0.1:
Terms of Service
- -It's mainly "be nice"
- --
-
-
-
Don't be a big meanie -
Arguments are cool and all but don't make them into flamewars. Try to act in good faith - we want to be at least on good terms with people. Please act with understanding towards others on this instance. Most people here are probably struggling with a lot, be mindful of that.
-
- -
-
Mark your lewds!
-Reminder that lewd is bad and nobody wants to be forced to see that. Just mark it sensitive, and post unlisted. That is to say, anything suggestive/ecchi upwards should be marked. If you wouldn't look at it with your parents/boss in the room, mark it. It goes without saying that if you're going to post lewd stuff, keep it sensible. Obviously nothing underaged or otherwise questionable. Or you could just not post lewd stuff. Either/or.
-
- -
-
This is a Kink Shame Zone
-Being a lewdie will be met with many anime girl reaction images shaming you for your lewdness. Go think about icky things on someone else's webzone™
-
- -
-
Keep it legal!
-Server is hosted in france, keep content legal for there (+ wherever you're browsing from)
-
- -
-
No ads/spambots
-I didn't think I'd have to specify this, but please do not set up bots solely for trying to advertise. -
- -
-
Non-TOS recommendations
-This is stuff that'd I'd like you to do, but I won't outright ban you if you don't follow them
--
-
- If someone is sadposting, don't antagonise them - they probably just want to vent -
- Put walls of text behind a subject (CW) - helps the timeline not get flooded with text -
-
- -
-
Other
-If you're here and you happen to play minecraft, feel free to message me with your username and come play with us sometime!
-
-
-
So I guess yeah, that's about it. Try to be nice, eh? We're probably all sad here.
- --
diff --git a/static/blurhash-overlay.png b/static/blurhash-overlay.png
new file mode 100755
index 00000000..209a9438
Binary files /dev/null and b/static/blurhash-overlay.png differ
diff --git a/static/logo.png b/static/logo.png
deleted file mode 100644
index 14aaf4a3..00000000
Binary files a/static/logo.png and /dev/null differ
diff --git a/static/theme-holder.css b/static/theme-holder.css
new file mode 100644
index 00000000..3e884036
--- /dev/null
+++ b/static/theme-holder.css
@@ -0,0 +1 @@
+// This file intentionally left blank
diff --git a/yarn.lock b/yarn.lock
index bbceba0b..7027b7d8 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1350,6 +1350,13 @@
minimatch "^3.0.4"
strip-json-comments "^3.1.1"
+"@floatingghost/pinch-zoom-element@^1.3.1":
+ version "1.3.1"
+ resolved "https://registry.yarnpkg.com/@floatingghost/pinch-zoom-element/-/pinch-zoom-element-1.3.1.tgz#5f327ad17ddf1f56777098aca088fdbf99cbd049"
+ integrity sha512-KnE7aBQdd/Fj1TzU5uzgwD9YAQ58DTMUks/PoTEBFW4zi0lBM9cN/j45wzcnzsT2VXG1S6qM7NMmq7NGm2//Fg==
+ dependencies:
+ pointer-tracker "^2.0.3"
+
"@fortawesome/fontawesome-common-types@6.2.0":
version "6.2.0"
resolved "https://registry.npmjs.org/@fortawesome/fontawesome-common-types/-/fontawesome-common-types-6.2.0.tgz"
@@ -1516,13 +1523,6 @@
"@jridgewell/resolve-uri" "^3.0.3"
"@jridgewell/sourcemap-codec" "^1.4.10"
-"@kazvmoe-infra/pinch-zoom-element@1.2.0":
- version "1.2.0"
- resolved "https://registry.npmjs.org/@kazvmoe-infra/pinch-zoom-element/-/pinch-zoom-element-1.2.0.tgz"
- integrity sha512-HBrhH5O/Fsp2bB7EGTXzCsBAVcMjknSagKC5pBdGpKsF8meHISR0kjDIdw4YoE0S+0oNMwJ6ZUZyIBrdywxPPw==
- dependencies:
- pointer-tracker "^2.0.3"
-
"@nicolo-ribaudo/eslint-scope-5-internals@5.1.1-v1":
version "5.1.1-v1"
resolved "https://registry.yarnpkg.com/@nicolo-ribaudo/eslint-scope-5-internals/-/eslint-scope-5-internals-5.1.1-v1.tgz#dbf733a965ca47b1973177dc0bb6c889edcfb129"
@@ -2494,6 +2494,11 @@ binary-extensions@^2.0.0:
resolved "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.2.0.tgz"
integrity sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA==
+blurhash@^2.0.4:
+ version "2.0.4"
+ resolved "https://registry.yarnpkg.com/blurhash/-/blurhash-2.0.4.tgz#60642a823b50acaaf3732ddb6c7dfd721bdfef2a"
+ integrity sha512-r/As72u2FbucLoK5NTegM/GucxJc3d8GvHc4ngo13IO/nt2HU4gONxNLq1XPN6EM/V8Y9URIa7PcSz2RZu553A==
+
body-parser@1.19.2:
version "1.19.2"
resolved "https://registry.npmjs.org/body-parser/-/body-parser-1.19.2.tgz"
@@ -5090,9 +5095,9 @@ isexe@^2.0.0:
resolved "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz"
integrity sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==
-iso-639-1@2.1.15:
+iso-639-1@^2.1.15:
version "2.1.15"
- resolved "https://registry.npmjs.org/iso-639-1/-/iso-639-1-2.1.15.tgz"
+ resolved "https://registry.yarnpkg.com/iso-639-1/-/iso-639-1-2.1.15.tgz#20cf78a4f691aeb802c16f17a6bad7d99271e85d"
integrity sha512-7c7mBznZu2ktfvyT582E2msM+Udc1EjOyhVRE/0ZsjD9LBtWSm23h3PtiRh2a35XoUsTQQjJXaJzuLjXsOdFDg==
isobject@^3.0.1: