Browse Source

Rename themes -> flavours ? ?

pull/3/head
kibigo! 1 year ago
parent
commit
bc4fa6b198
100 changed files with 165 additions and 180 deletions
  1. 0
    3
      .gitmodules
  2. 14
    22
      app/controllers/application_controller.rb
  3. 1
    1
      app/javascript/core/settings.js
  4. 1
    1
      app/javascript/flavours/glitch/actions/accounts.js
  5. 0
    0
      app/javascript/flavours/glitch/actions/alerts.js
  6. 1
    1
      app/javascript/flavours/glitch/actions/blocks.js
  7. 0
    0
      app/javascript/flavours/glitch/actions/bundles.js
  8. 1
    1
      app/javascript/flavours/glitch/actions/cards.js
  9. 0
    0
      app/javascript/flavours/glitch/actions/columns.js
  10. 2
    2
      app/javascript/flavours/glitch/actions/compose.js
  11. 1
    1
      app/javascript/flavours/glitch/actions/domain_blocks.js
  12. 0
    0
      app/javascript/flavours/glitch/actions/emojis.js
  13. 1
    1
      app/javascript/flavours/glitch/actions/favourites.js
  14. 0
    0
      app/javascript/flavours/glitch/actions/height_cache.js
  15. 1
    1
      app/javascript/flavours/glitch/actions/interactions.js
  16. 0
    0
      app/javascript/flavours/glitch/actions/local_settings.js
  17. 0
    0
      app/javascript/flavours/glitch/actions/modal.js
  18. 2
    2
      app/javascript/flavours/glitch/actions/mutes.js
  19. 1
    1
      app/javascript/flavours/glitch/actions/notifications.js
  20. 0
    0
      app/javascript/flavours/glitch/actions/onboarding.js
  21. 2
    2
      app/javascript/flavours/glitch/actions/pin_statuses.js
  22. 0
    0
      app/javascript/flavours/glitch/actions/push_notifications.js
  23. 1
    1
      app/javascript/flavours/glitch/actions/reports.js
  24. 1
    1
      app/javascript/flavours/glitch/actions/search.js
  25. 0
    0
      app/javascript/flavours/glitch/actions/settings.js
  26. 1
    1
      app/javascript/flavours/glitch/actions/statuses.js
  27. 0
    0
      app/javascript/flavours/glitch/actions/store.js
  28. 1
    1
      app/javascript/flavours/glitch/actions/streaming.js
  29. 1
    1
      app/javascript/flavours/glitch/actions/timelines.js
  30. 1
    1
      app/javascript/flavours/glitch/components/account.js
  31. 0
    0
      app/javascript/flavours/glitch/components/attachment_list.js
  32. 1
    1
      app/javascript/flavours/glitch/components/autosuggest_emoji.js
  33. 2
    2
      app/javascript/flavours/glitch/components/autosuggest_textarea.js
  34. 0
    0
      app/javascript/flavours/glitch/components/avatar.js
  35. 0
    0
      app/javascript/flavours/glitch/components/avatar_overlay.js
  36. 0
    0
      app/javascript/flavours/glitch/components/button.js
  37. 1
    1
      app/javascript/flavours/glitch/components/collapsable.js
  38. 1
    1
      app/javascript/flavours/glitch/components/column.js
  39. 0
    0
      app/javascript/flavours/glitch/components/column_back_button.js
  40. 0
    0
      app/javascript/flavours/glitch/components/column_back_button_slim.js
  41. 1
    2
      app/javascript/flavours/glitch/components/column_header.js
  42. 0
    0
      app/javascript/flavours/glitch/components/display_name.js
  43. 1
    1
      app/javascript/flavours/glitch/components/dropdown_menu.js
  44. 0
    0
      app/javascript/flavours/glitch/components/extended_video_player.js
  45. 1
    1
      app/javascript/flavours/glitch/components/icon_button.js
  46. 2
    2
      app/javascript/flavours/glitch/components/intersection_observer_article.js
  47. 0
    0
      app/javascript/flavours/glitch/components/load_more.js
  48. 0
    0
      app/javascript/flavours/glitch/components/loading_indicator.js
  49. 2
    2
      app/javascript/flavours/glitch/components/media_gallery.js
  50. 0
    0
      app/javascript/flavours/glitch/components/missing_indicator.js
  51. 0
    0
      app/javascript/flavours/glitch/components/notification_purge_buttons.js
  52. 0
    0
      app/javascript/flavours/glitch/components/permalink.js
  53. 0
    0
      app/javascript/flavours/glitch/components/relative_timestamp.js
  54. 3
    3
      app/javascript/flavours/glitch/components/scrollable_list.js
  55. 0
    0
      app/javascript/flavours/glitch/components/setting_text.js
  56. 2
    2
      app/javascript/flavours/glitch/components/status.js
  57. 2
    5
      app/javascript/flavours/glitch/components/status_action_bar.js
  58. 1
    1
      app/javascript/flavours/glitch/components/status_content.js
  59. 0
    0
      app/javascript/flavours/glitch/components/status_header.js
  60. 1
    1
      app/javascript/flavours/glitch/components/status_list.js
  61. 0
    0
      app/javascript/flavours/glitch/components/status_prepend.js
  62. 0
    0
      app/javascript/flavours/glitch/components/status_visibility_icon.js
  63. 6
    6
      app/javascript/flavours/glitch/containers/account_container.js
  64. 1
    1
      app/javascript/flavours/glitch/containers/card_container.js
  65. 4
    4
      app/javascript/flavours/glitch/containers/compose_container.js
  66. 3
    3
      app/javascript/flavours/glitch/containers/dropdown_menu_container.js
  67. 2
    2
      app/javascript/flavours/glitch/containers/intersection_observer_article_container.js
  68. 6
    6
      app/javascript/flavours/glitch/containers/mastodon.js
  69. 1
    1
      app/javascript/flavours/glitch/containers/media_gallery_container.js
  70. 3
    3
      app/javascript/flavours/glitch/containers/notification_purge_buttons_container.js
  71. 10
    10
      app/javascript/flavours/glitch/containers/status_container.js
  72. 5
    5
      app/javascript/flavours/glitch/containers/timeline_container.js
  73. 1
    1
      app/javascript/flavours/glitch/containers/video_container.js
  74. 2
    2
      app/javascript/flavours/glitch/features/account/components/action_bar.js
  75. 5
    5
      app/javascript/flavours/glitch/features/account/components/header.js
  76. 1
    1
      app/javascript/flavours/glitch/features/account_gallery/components/media_item.js
  77. 8
    8
      app/javascript/flavours/glitch/features/account_gallery/index.js
  78. 3
    3
      app/javascript/flavours/glitch/features/account_timeline/components/header.js
  79. 8
    8
      app/javascript/flavours/glitch/features/account_timeline/containers/header_container.js
  80. 2
    2
      app/javascript/flavours/glitch/features/account_timeline/index.js
  81. 5
    5
      app/javascript/flavours/glitch/features/blocks/index.js
  82. 1
    1
      app/javascript/flavours/glitch/features/community_timeline/components/column_settings.js
  83. 1
    1
      app/javascript/flavours/glitch/features/community_timeline/containers/column_settings_container.js
  84. 6
    6
      app/javascript/flavours/glitch/features/community_timeline/index.js
  85. 0
    0
      app/javascript/flavours/glitch/features/compose/components/advanced_options.js
  86. 0
    0
      app/javascript/flavours/glitch/features/compose/components/advanced_options_toggle.js
  87. 2
    2
      app/javascript/flavours/glitch/features/compose/components/attach_options.js
  88. 2
    2
      app/javascript/flavours/glitch/features/compose/components/autosuggest_account.js
  89. 0
    0
      app/javascript/flavours/glitch/features/compose/components/character_counter.js
  90. 6
    6
      app/javascript/flavours/glitch/features/compose/components/compose_form.js
  91. 1
    1
      app/javascript/flavours/glitch/features/compose/components/dropdown.js
  92. 2
    2
      app/javascript/flavours/glitch/features/compose/components/emoji_picker_dropdown.js
  93. 3
    3
      app/javascript/flavours/glitch/features/compose/components/navigation_bar.js
  94. 2
    2
      app/javascript/flavours/glitch/features/compose/components/privacy_dropdown.js
  95. 3
    3
      app/javascript/flavours/glitch/features/compose/components/reply_indicator.js
  96. 1
    1
      app/javascript/flavours/glitch/features/compose/components/search.js
  97. 2
    2
      app/javascript/flavours/glitch/features/compose/components/search_results.js
  98. 0
    0
      app/javascript/flavours/glitch/features/compose/components/text_icon_button.js
  99. 2
    2
      app/javascript/flavours/glitch/features/compose/components/upload.js
  100. 0
    0
      app/javascript/flavours/glitch/features/compose/components/upload_button.js

+ 0
- 3
.gitmodules View File

@@ -1,3 +0,0 @@
[submodule "app/javascript/themes/mastodon-go"]
path = app/javascript/themes/mastodon-go
url = https://github.com/marrus-sh/mastodon-go

+ 14
- 22
app/controllers/application_controller.rb View File

@@ -12,7 +12,7 @@ class ApplicationController < ActionController::Base

helper_method :current_account
helper_method :current_session
helper_method :current_theme
helper_method :current_flavour
helper_method :current_skin
helper_method :single_user_mode?

@@ -57,8 +57,8 @@ class ApplicationController < ActionController::Base
def pack(data, pack_name, skin = 'default')
return nil unless pack?(data, pack_name)
pack_data = {
common: pack_name == 'common' ? nil : resolve_pack(data['name'] ? Themes.instance.get(current_theme) : Themes.instance.core, 'common'),
name: data['name'],
common: pack_name == 'common' ? nil : resolve_pack(data['name'] ? Themes.instance.flavour(current_flavour) : Themes.instance.core, 'common'),
flavour: data['name'],
pack: pack_name,
preload: nil,
skin: nil,
@@ -88,8 +88,8 @@ class ApplicationController < ActionController::Base

def nil_pack(data, pack_name, skin = 'default')
{
common: pack_name == 'common' ? nil : resolve_pack(data['name'] ? Themes.instance.get(current_theme) : Themes.instance.core, 'common', skin),
name: data['name'],
common: pack_name == 'common' ? nil : resolve_pack(data['name'] ? Themes.instance.flavour(current_flavour) : Themes.instance.core, 'common', skin),
flavour: data['name'],
pack: nil,
preload: nil,
skin: nil,
@@ -102,23 +102,23 @@ class ApplicationController < ActionController::Base
if data['name'] && data.key?('fallback')
if data['fallback'].nil?
return nil_pack(data, pack_name, skin)
elsif data['fallback'].is_a?(String) && Themes.instance.get(data['fallback'])
return resolve_pack(Themes.instance.get(data['fallback']), pack_name, skin)
elsif data['fallback'].is_a?(String) && Themes.instance.flavour(data['fallback'])
return resolve_pack(Themes.instance.flavour(data['fallback']), pack_name, skin)
elsif data['fallback'].is_a?(Array)
data['fallback'].each do |fallback|
return resolve_pack(Themes.instance.get(fallback), pack_name, skin) if Themes.instance.get(fallback)
return resolve_pack(Themes.instance.flavour(fallback), pack_name, skin) if Themes.instance.flavour(fallback)
end
end
return nil_pack(data, pack_name, skin)
end
return data.key?('name') && data['name'] != default_theme ? resolve_pack(Themes.instance.get(default_theme), pack_name, skin) : nil_pack(data, pack_name, skin)
return data.key?('name') && data['name'] != Setting.default_settings['flavour'] ? resolve_pack(Themes.instance.flavour(Setting.default_settings['flavour']), pack_name, skin) : nil_pack(data, pack_name, skin)
end
result
end

def use_pack(pack_name)
@core = resolve_pack(Themes.instance.core, pack_name)
@theme = resolve_pack(Themes.instance.get(current_theme), pack_name, current_skin)
@theme = resolve_pack(Themes.instance.flavour(current_flavour), pack_name, current_skin)
end

protected
@@ -151,21 +151,13 @@ class ApplicationController < ActionController::Base
@current_session ||= SessionActivation.find_by(session_id: cookies.signed['_session_id'])
end

def default_theme
Setting.default_settings['theme']
end

def current_theme
return default_theme unless Themes.instance.names.include? current_user&.setting_theme
current_user.setting_theme
end

def default_skin
'default'
def current_flavour
return Setting.default_settings['flavour'] unless Themes.instance.flavours.include? current_user&.setting_flavour
current_user.setting_flavour
end

def current_skin
return default_skin unless Themes.instance.skins_for(current_theme).include? current_user&.setting_skin
return 'default' unless Themes.instance.skins_for(current_flavour).include? current_user&.setting_skin
current_user.setting_skin
end


+ 1
- 1
app/javascript/core/settings.js View File

@@ -3,7 +3,7 @@
const { length } = require('stringz');
const { delegate } = require('rails-ujs');

import { processBio } from 'themes/glitch/util/bio_metadata';
import { processBio } from 'flavours/glitch/util/bio_metadata';

delegate(document, '.account_display_name', 'input', ({ target }) => {
const nameCounter = document.querySelector('.name-counter');

app/javascript/themes/glitch/actions/accounts.js → app/javascript/flavours/glitch/actions/accounts.js View File

@@ -1,4 +1,4 @@
import api, { getLinks } from 'themes/glitch/util/api';
import api, { getLinks } from 'flavours/glitch/util/api';

export const ACCOUNT_FETCH_REQUEST = 'ACCOUNT_FETCH_REQUEST';
export const ACCOUNT_FETCH_SUCCESS = 'ACCOUNT_FETCH_SUCCESS';

app/javascript/themes/glitch/actions/alerts.js → app/javascript/flavours/glitch/actions/alerts.js View File


app/javascript/themes/glitch/actions/blocks.js → app/javascript/flavours/glitch/actions/blocks.js View File

@@ -1,4 +1,4 @@
import api, { getLinks } from 'themes/glitch/util/api';
import api, { getLinks } from 'flavours/glitch/util/api';
import { fetchRelationships } from './accounts';

export const BLOCKS_FETCH_REQUEST = 'BLOCKS_FETCH_REQUEST';

app/javascript/themes/glitch/actions/bundles.js → app/javascript/flavours/glitch/actions/bundles.js View File


app/javascript/themes/glitch/actions/cards.js → app/javascript/flavours/glitch/actions/cards.js View File

@@ -1,4 +1,4 @@
import api from 'themes/glitch/util/api';
import api from 'flavours/glitch/util/api';

export const STATUS_CARD_FETCH_REQUEST = 'STATUS_CARD_FETCH_REQUEST';
export const STATUS_CARD_FETCH_SUCCESS = 'STATUS_CARD_FETCH_SUCCESS';

app/javascript/themes/glitch/actions/columns.js → app/javascript/flavours/glitch/actions/columns.js View File


app/javascript/themes/glitch/actions/compose.js → app/javascript/flavours/glitch/actions/compose.js View File

@@ -1,6 +1,6 @@
import api from 'themes/glitch/util/api';
import api from 'flavours/glitch/util/api';
import { throttle } from 'lodash';
import { search as emojiSearch } from 'themes/glitch/util/emoji/emoji_mart_search_light';
import { search as emojiSearch } from 'flavours/glitch/util/emoji/emoji_mart_search_light';
import { useEmoji } from './emojis';

import {

app/javascript/themes/glitch/actions/domain_blocks.js → app/javascript/flavours/glitch/actions/domain_blocks.js View File

@@ -1,4 +1,4 @@
import api, { getLinks } from 'themes/glitch/util/api';
import api, { getLinks } from 'flavours/glitch/util/api';

export const DOMAIN_BLOCK_REQUEST = 'DOMAIN_BLOCK_REQUEST';
export const DOMAIN_BLOCK_SUCCESS = 'DOMAIN_BLOCK_SUCCESS';

app/javascript/themes/glitch/actions/emojis.js → app/javascript/flavours/glitch/actions/emojis.js View File


app/javascript/themes/glitch/actions/favourites.js → app/javascript/flavours/glitch/actions/favourites.js View File

@@ -1,4 +1,4 @@
import api, { getLinks } from 'themes/glitch/util/api';
import api, { getLinks } from 'flavours/glitch/util/api';

export const FAVOURITED_STATUSES_FETCH_REQUEST = 'FAVOURITED_STATUSES_FETCH_REQUEST';
export const FAVOURITED_STATUSES_FETCH_SUCCESS = 'FAVOURITED_STATUSES_FETCH_SUCCESS';

app/javascript/themes/glitch/actions/height_cache.js → app/javascript/flavours/glitch/actions/height_cache.js View File


app/javascript/themes/glitch/actions/interactions.js → app/javascript/flavours/glitch/actions/interactions.js View File

@@ -1,4 +1,4 @@
import api from 'themes/glitch/util/api';
import api from 'flavours/glitch/util/api';

export const REBLOG_REQUEST = 'REBLOG_REQUEST';
export const REBLOG_SUCCESS = 'REBLOG_SUCCESS';

app/javascript/themes/glitch/actions/local_settings.js → app/javascript/flavours/glitch/actions/local_settings.js View File


app/javascript/themes/glitch/actions/modal.js → app/javascript/flavours/glitch/actions/modal.js View File


app/javascript/themes/glitch/actions/mutes.js → app/javascript/flavours/glitch/actions/mutes.js View File

@@ -1,6 +1,6 @@
import api, { getLinks } from 'themes/glitch/util/api';
import api, { getLinks } from 'flavours/glitch/util/api';
import { fetchRelationships } from './accounts';
import { openModal } from 'themes/glitch/actions/modal';
import { openModal } from 'flavours/glitch/actions/modal';

export const MUTES_FETCH_REQUEST = 'MUTES_FETCH_REQUEST';
export const MUTES_FETCH_SUCCESS = 'MUTES_FETCH_SUCCESS';

app/javascript/themes/glitch/actions/notifications.js → app/javascript/flavours/glitch/actions/notifications.js View File

@@ -1,4 +1,4 @@
import api, { getLinks } from 'themes/glitch/util/api';
import api, { getLinks } from 'flavours/glitch/util/api';
import { List as ImmutableList } from 'immutable';
import IntlMessageFormat from 'intl-messageformat';
import { fetchRelationships } from './accounts';

app/javascript/themes/glitch/actions/onboarding.js → app/javascript/flavours/glitch/actions/onboarding.js View File


app/javascript/themes/glitch/actions/pin_statuses.js → app/javascript/flavours/glitch/actions/pin_statuses.js View File

@@ -1,10 +1,10 @@
import api from 'themes/glitch/util/api';
import api from 'flavours/glitch/util/api';

export const PINNED_STATUSES_FETCH_REQUEST = 'PINNED_STATUSES_FETCH_REQUEST';
export const PINNED_STATUSES_FETCH_SUCCESS = 'PINNED_STATUSES_FETCH_SUCCESS';
export const PINNED_STATUSES_FETCH_FAIL = 'PINNED_STATUSES_FETCH_FAIL';

import { me } from 'themes/glitch/util/initial_state';
import { me } from 'flavours/glitch/util/initial_state';

export function fetchPinnedStatuses() {
return (dispatch, getState) => {

app/javascript/themes/glitch/actions/push_notifications.js → app/javascript/flavours/glitch/actions/push_notifications.js View File


app/javascript/themes/glitch/actions/reports.js → app/javascript/flavours/glitch/actions/reports.js View File

@@ -1,4 +1,4 @@
import api from 'themes/glitch/util/api';
import api from 'flavours/glitch/util/api';
import { openModal, closeModal } from './modal';

export const REPORT_INIT = 'REPORT_INIT';

app/javascript/themes/glitch/actions/search.js → app/javascript/flavours/glitch/actions/search.js View File

@@ -1,4 +1,4 @@
import api from 'themes/glitch/util/api';
import api from 'flavours/glitch/util/api';

export const SEARCH_CHANGE = 'SEARCH_CHANGE';
export const SEARCH_CLEAR = 'SEARCH_CLEAR';

app/javascript/themes/glitch/actions/settings.js → app/javascript/flavours/glitch/actions/settings.js View File


app/javascript/themes/glitch/actions/statuses.js → app/javascript/flavours/glitch/actions/statuses.js View File

@@ -1,4 +1,4 @@
import api from 'themes/glitch/util/api';
import api from 'flavours/glitch/util/api';

import { deleteFromTimelines } from './timelines';
import { fetchStatusCard } from './cards';

app/javascript/themes/glitch/actions/store.js → app/javascript/flavours/glitch/actions/store.js View File


app/javascript/themes/glitch/actions/streaming.js → app/javascript/flavours/glitch/actions/streaming.js View File

@@ -1,4 +1,4 @@
import { connectStream } from 'themes/glitch/util/stream';
import { connectStream } from 'flavours/glitch/util/stream';
import {
updateTimeline,
deleteFromTimelines,

app/javascript/themes/glitch/actions/timelines.js → app/javascript/flavours/glitch/actions/timelines.js View File

@@ -1,4 +1,4 @@
import api, { getLinks } from 'themes/glitch/util/api';
import api, { getLinks } from 'flavours/glitch/util/api';
import { Map as ImmutableMap, List as ImmutableList } from 'immutable';

export const TIMELINE_UPDATE = 'TIMELINE_UPDATE';

app/javascript/themes/glitch/components/account.js → app/javascript/flavours/glitch/components/account.js View File

@@ -7,7 +7,7 @@ import Permalink from './permalink';
import IconButton from './icon_button';
import { defineMessages, injectIntl } from 'react-intl';
import ImmutablePureComponent from 'react-immutable-pure-component';
import { me } from 'themes/glitch/util/initial_state';
import { me } from 'flavours/glitch/util/initial_state';

const messages = defineMessages({
follow: { id: 'account.follow', defaultMessage: 'Follow' },

app/javascript/themes/glitch/components/attachment_list.js → app/javascript/flavours/glitch/components/attachment_list.js View File


app/javascript/themes/glitch/components/autosuggest_emoji.js → app/javascript/flavours/glitch/components/autosuggest_emoji.js View File

@@ -1,6 +1,6 @@
import React from 'react';
import PropTypes from 'prop-types';
import unicodeMapping from 'themes/glitch/util/emoji/emoji_unicode_mapping_light';
import unicodeMapping from 'flavours/glitch/util/emoji/emoji_unicode_mapping_light';

const assetHost = process.env.CDN_HOST || '';


app/javascript/themes/glitch/components/autosuggest_textarea.js → app/javascript/flavours/glitch/components/autosuggest_textarea.js View File

@@ -1,9 +1,9 @@
import React from 'react';
import AutosuggestAccountContainer from 'themes/glitch/features/compose/containers/autosuggest_account_container';
import AutosuggestAccountContainer from 'flavours/glitch/features/compose/containers/autosuggest_account_container';
import AutosuggestEmoji from './autosuggest_emoji';
import ImmutablePropTypes from 'react-immutable-proptypes';
import PropTypes from 'prop-types';
import { isRtl } from 'themes/glitch/util/rtl';
import { isRtl } from 'flavours/glitch/util/rtl';
import ImmutablePureComponent from 'react-immutable-pure-component';
import Textarea from 'react-textarea-autosize';
import classNames from 'classnames';

app/javascript/themes/glitch/components/avatar.js → app/javascript/flavours/glitch/components/avatar.js View File


app/javascript/themes/glitch/components/avatar_overlay.js → app/javascript/flavours/glitch/components/avatar_overlay.js View File


app/javascript/themes/glitch/components/button.js → app/javascript/flavours/glitch/components/button.js View File


app/javascript/themes/glitch/components/collapsable.js → app/javascript/flavours/glitch/components/collapsable.js View File

@@ -1,5 +1,5 @@
import React from 'react';
import Motion from 'themes/glitch/util/optional_motion';
import Motion from 'flavours/glitch/util/optional_motion';
import spring from 'react-motion/lib/spring';
import PropTypes from 'prop-types';


app/javascript/themes/glitch/components/column.js → app/javascript/flavours/glitch/components/column.js View File

@@ -1,7 +1,7 @@
import React from 'react';
import PropTypes from 'prop-types';
import detectPassiveEvents from 'detect-passive-events';
import { scrollTop } from 'themes/glitch/util/scroll';
import { scrollTop } from 'flavours/glitch/util/scroll';

export default class Column extends React.PureComponent {


app/javascript/themes/glitch/components/column_back_button.js → app/javascript/flavours/glitch/components/column_back_button.js View File


app/javascript/themes/glitch/components/column_back_button_slim.js → app/javascript/flavours/glitch/components/column_back_button_slim.js View File


app/javascript/themes/glitch/components/column_header.js → app/javascript/flavours/glitch/components/column_header.js View File

@@ -4,8 +4,7 @@ import classNames from 'classnames';
import { defineMessages, FormattedMessage, injectIntl } from 'react-intl';
import ImmutablePropTypes from 'react-immutable-proptypes';

// Glitch imports
import NotificationPurgeButtonsContainer from 'themes/glitch/containers/notification_purge_buttons_container';
import NotificationPurgeButtonsContainer from 'flavours/glitch/containers/notification_purge_buttons_container';

const messages = defineMessages({
show: { id: 'column_header.show_settings', defaultMessage: 'Show settings' },

app/javascript/themes/glitch/components/display_name.js → app/javascript/flavours/glitch/components/display_name.js View File


app/javascript/themes/glitch/components/dropdown_menu.js → app/javascript/flavours/glitch/components/dropdown_menu.js View File

@@ -3,7 +3,7 @@ import PropTypes from 'prop-types';
import ImmutablePropTypes from 'react-immutable-proptypes';
import IconButton from './icon_button';
import Overlay from 'react-overlays/lib/Overlay';
import Motion from 'themes/glitch/util/optional_motion';
import Motion from 'flavours/glitch/util/optional_motion';
import spring from 'react-motion/lib/spring';
import detectPassiveEvents from 'detect-passive-events';


app/javascript/themes/glitch/components/extended_video_player.js → app/javascript/flavours/glitch/components/extended_video_player.js View File


app/javascript/themes/glitch/components/icon_button.js → app/javascript/flavours/glitch/components/icon_button.js View File

@@ -1,5 +1,5 @@
import React from 'react';
import Motion from 'themes/glitch/util/optional_motion';
import Motion from 'flavours/glitch/util/optional_motion';
import spring from 'react-motion/lib/spring';
import PropTypes from 'prop-types';
import classNames from 'classnames';

app/javascript/themes/glitch/components/intersection_observer_article.js → app/javascript/flavours/glitch/components/intersection_observer_article.js View File

@@ -1,7 +1,7 @@
import React from 'react';
import PropTypes from 'prop-types';
import scheduleIdleTask from 'themes/glitch/util/schedule_idle_task';
import getRectFromEntry from 'themes/glitch/util/get_rect_from_entry';
import scheduleIdleTask from 'flavours/glitch/util/schedule_idle_task';
import getRectFromEntry from 'flavours/glitch/util/get_rect_from_entry';
import { is } from 'immutable';

// Diff these props in the "rendered" state

app/javascript/themes/glitch/components/load_more.js → app/javascript/flavours/glitch/components/load_more.js View File


app/javascript/themes/glitch/components/loading_indicator.js → app/javascript/flavours/glitch/components/loading_indicator.js View File


app/javascript/themes/glitch/components/media_gallery.js → app/javascript/flavours/glitch/components/media_gallery.js View File

@@ -4,9 +4,9 @@ import PropTypes from 'prop-types';
import { is } from 'immutable';
import IconButton from './icon_button';
import { defineMessages, injectIntl, FormattedMessage } from 'react-intl';
import { isIOS } from 'themes/glitch/util/is_mobile';
import { isIOS } from 'flavours/glitch/util/is_mobile';
import classNames from 'classnames';
import { autoPlayGif } from 'themes/glitch/util/initial_state';
import { autoPlayGif } from 'flavours/glitch/util/initial_state';

const messages = defineMessages({
toggle_visible: { id: 'media_gallery.toggle_visible', defaultMessage: 'Toggle visibility' },

app/javascript/themes/glitch/components/missing_indicator.js → app/javascript/flavours/glitch/components/missing_indicator.js View File


app/javascript/themes/glitch/components/notification_purge_buttons.js → app/javascript/flavours/glitch/components/notification_purge_buttons.js View File


app/javascript/themes/glitch/components/permalink.js → app/javascript/flavours/glitch/components/permalink.js View File


app/javascript/themes/glitch/components/relative_timestamp.js → app/javascript/flavours/glitch/components/relative_timestamp.js View File


app/javascript/themes/glitch/components/scrollable_list.js → app/javascript/flavours/glitch/components/scrollable_list.js View File

@@ -1,13 +1,13 @@
import React, { PureComponent } from 'react';
import { ScrollContainer } from 'react-router-scroll-4';
import PropTypes from 'prop-types';
import IntersectionObserverArticleContainer from 'themes/glitch/containers/intersection_observer_article_container';
import IntersectionObserverArticleContainer from 'flavours/glitch/containers/intersection_observer_article_container';
import LoadMore from './load_more';
import IntersectionObserverWrapper from 'themes/glitch/util/intersection_observer_wrapper';
import IntersectionObserverWrapper from 'flavours/glitch/util/intersection_observer_wrapper';
import { throttle } from 'lodash';
import { List as ImmutableList } from 'immutable';
import classNames from 'classnames';
import { attachFullscreenListener, detachFullscreenListener, isFullscreen } from 'themes/glitch/util/fullscreen';
import { attachFullscreenListener, detachFullscreenListener, isFullscreen } from 'flavours/glitch/util/fullscreen';

export default class ScrollableList extends PureComponent {


app/javascript/themes/glitch/components/setting_text.js → app/javascript/flavours/glitch/components/setting_text.js View File


app/javascript/themes/glitch/components/status.js → app/javascript/flavours/glitch/components/status.js View File

@@ -6,9 +6,9 @@ import StatusHeader from './status_header';
import StatusContent from './status_content';
import StatusActionBar from './status_action_bar';
import ImmutablePureComponent from 'react-immutable-pure-component';
import { MediaGallery, Video } from 'themes/glitch/util/async-components';
import { MediaGallery, Video } from 'flavours/glitch/util/async-components';
import { HotKeys } from 'react-hotkeys';
import NotificationOverlayContainer from 'themes/glitch/features/notifications/containers/overlay_container';
import NotificationOverlayContainer from 'flavours/glitch/features/notifications/containers/overlay_container';

// We use the component (and not the container) since we do not want
// to use the progress bar to show download progress

app/javascript/themes/glitch/components/status_action_bar.js → app/javascript/flavours/glitch/components/status_action_bar.js View File

@@ -1,14 +1,11 @@
// THIS FILE EXISTS FOR UPSTREAM COMPATIBILITY & SHOULDN'T BE USED !!
// SEE INSTEAD : glitch/components/status/action_bar

import React from 'react';
import ImmutablePropTypes from 'react-immutable-proptypes';
import PropTypes from 'prop-types';
import IconButton from './icon_button';
import DropdownMenuContainer from 'themes/glitch/containers/dropdown_menu_container';
import DropdownMenuContainer from 'flavours/glitch/containers/dropdown_menu_container';
import { defineMessages, injectIntl } from 'react-intl';
import ImmutablePureComponent from 'react-immutable-pure-component';
import { me } from 'themes/glitch/util/initial_state';
import { me } from 'flavours/glitch/util/initial_state';
import RelativeTimestamp from './relative_timestamp';

const messages = defineMessages({

app/javascript/themes/glitch/components/status_content.js → app/javascript/flavours/glitch/components/status_content.js View File

@@ -1,7 +1,7 @@
import React from 'react';
import ImmutablePropTypes from 'react-immutable-proptypes';
import PropTypes from 'prop-types';
import { isRtl } from 'themes/glitch/util/rtl';
import { isRtl } from 'flavours/glitch/util/rtl';
import { FormattedMessage } from 'react-intl';
import Permalink from './permalink';
import classnames from 'classnames';

app/javascript/themes/glitch/components/status_header.js → app/javascript/flavours/glitch/components/status_header.js View File


app/javascript/themes/glitch/components/status_list.js → app/javascript/flavours/glitch/components/status_list.js View File

@@ -1,7 +1,7 @@
import React from 'react';
import ImmutablePropTypes from 'react-immutable-proptypes';
import PropTypes from 'prop-types';
import StatusContainer from 'themes/glitch/containers/status_container';
import StatusContainer from 'flavours/glitch/containers/status_container';
import ImmutablePureComponent from 'react-immutable-pure-component';
import ScrollableList from './scrollable_list';


app/javascript/themes/glitch/components/status_prepend.js → app/javascript/flavours/glitch/components/status_prepend.js View File


app/javascript/themes/glitch/components/status_visibility_icon.js → app/javascript/flavours/glitch/components/status_visibility_icon.js View File


app/javascript/themes/glitch/containers/account_container.js → app/javascript/flavours/glitch/containers/account_container.js View File

@@ -1,8 +1,8 @@
import React from 'react';
import { connect } from 'react-redux';
import { defineMessages, injectIntl, FormattedMessage } from 'react-intl';
import { makeGetAccount } from 'themes/glitch/selectors';
import Account from 'themes/glitch/components/account';
import { makeGetAccount } from 'flavours/glitch/selectors';
import Account from 'flavours/glitch/components/account';
import {
followAccount,
unfollowAccount,
@@ -10,10 +10,10 @@ import {
unblockAccount,
muteAccount,
unmuteAccount,
} from 'themes/glitch/actions/accounts';
import { openModal } from 'themes/glitch/actions/modal';
import { initMuteModal } from 'themes/glitch/actions/mutes';
import { unfollowModal } from 'themes/glitch/util/initial_state';
} from 'flavours/glitch/actions/accounts';
import { openModal } from 'flavours/glitch/actions/modal';
import { initMuteModal } from 'flavours/glitch/actions/mutes';
import { unfollowModal } from 'flavours/glitch/util/initial_state';

const messages = defineMessages({
unfollowConfirm: { id: 'confirmations.unfollow.confirm', defaultMessage: 'Unfollow' },

app/javascript/themes/glitch/containers/card_container.js → app/javascript/flavours/glitch/containers/card_container.js View File

@@ -1,6 +1,6 @@
import React from 'react';
import PropTypes from 'prop-types';
import Card from 'themes/glitch/features/status/components/card';
import Card from 'flavours/glitch/features/status/components/card';
import { fromJS } from 'immutable';

export default class CardContainer extends React.PureComponent {

app/javascript/themes/glitch/containers/compose_container.js → app/javascript/flavours/glitch/containers/compose_container.js View File

@@ -1,12 +1,12 @@
import React from 'react';
import { Provider } from 'react-redux';
import PropTypes from 'prop-types';
import configureStore from 'themes/glitch/store/configureStore';
import { hydrateStore } from 'themes/glitch/actions/store';
import configureStore from 'flavours/glitch/store/configureStore';
import { hydrateStore } from 'flavours/glitch/actions/store';
import { IntlProvider, addLocaleData } from 'react-intl';
import { getLocale } from 'mastodon/locales';
import Compose from 'themes/glitch/features/standalone/compose';
import initialState from 'themes/glitch/util/initial_state';
import Compose from 'flavours/glitch/features/standalone/compose';
import initialState from 'flavours/glitch/util/initial_state';

const { localeData, messages } = getLocale();
addLocaleData(localeData);

app/javascript/themes/glitch/containers/dropdown_menu_container.js → app/javascript/flavours/glitch/containers/dropdown_menu_container.js View File

@@ -1,7 +1,7 @@
import { openModal, closeModal } from 'themes/glitch/actions/modal';
import { openModal, closeModal } from 'flavours/glitch/actions/modal';
import { connect } from 'react-redux';
import DropdownMenu from 'themes/glitch/components/dropdown_menu';
import { isUserTouching } from 'themes/glitch/util/is_mobile';
import DropdownMenu from 'flavours/glitch/components/dropdown_menu';
import { isUserTouching } from 'flavours/glitch/util/is_mobile';

const mapStateToProps = state => ({
isModalOpen: state.get('modal').modalType === 'ACTIONS',

app/javascript/themes/glitch/containers/intersection_observer_article_container.js → app/javascript/flavours/glitch/containers/intersection_observer_article_container.js View File

@@ -1,6 +1,6 @@
import { connect } from 'react-redux';
import IntersectionObserverArticle from 'themes/glitch/components/intersection_observer_article';
import { setHeight } from 'themes/glitch/actions/height_cache';
import IntersectionObserverArticle from 'flavours/glitch/components/intersection_observer_article';
import { setHeight } from 'flavours/glitch/actions/height_cache';

const makeMapStateToProps = (state, props) => ({
cachedHeight: state.getIn(['height_cache', props.saveHeightKey, props.id]),

app/javascript/themes/glitch/containers/mastodon.js → app/javascript/flavours/glitch/containers/mastodon.js View File

@@ -1,16 +1,16 @@
import React from 'react';
import { Provider } from 'react-redux';
import PropTypes from 'prop-types';
import configureStore from 'themes/glitch/store/configureStore';
import { showOnboardingOnce } from 'themes/glitch/actions/onboarding';
import configureStore from 'flavours/glitch/store/configureStore';
import { showOnboardingOnce } from 'flavours/glitch/actions/onboarding';
import { BrowserRouter, Route } from 'react-router-dom';
import { ScrollContext } from 'react-router-scroll-4';
import UI from 'themes/glitch/features/ui';
import { hydrateStore } from 'themes/glitch/actions/store';
import { connectUserStream } from 'themes/glitch/actions/streaming';
import UI from 'flavours/glitch/features/ui';
import { hydrateStore } from 'flavours/glitch/actions/store';
import { connectUserStream } from 'flavours/glitch/actions/streaming';
import { IntlProvider, addLocaleData } from 'react-intl';
import { getLocale } from 'locales';
import initialState from 'themes/glitch/util/initial_state';
import initialState from 'flavours/glitch/util/initial_state';

const { localeData, messages } = getLocale();
addLocaleData(localeData);

app/javascript/themes/glitch/containers/media_gallery_container.js → app/javascript/flavours/glitch/containers/media_gallery_container.js View File

@@ -2,7 +2,7 @@ import React from 'react';
import PropTypes from 'prop-types';
import { IntlProvider, addLocaleData } from 'react-intl';
import { getLocale } from 'mastodon/locales';
import MediaGallery from 'themes/glitch/components/media_gallery';
import MediaGallery from 'flavours/glitch/components/media_gallery';
import { fromJS } from 'immutable';

const { localeData, messages } = getLocale();

app/javascript/themes/glitch/containers/notification_purge_buttons_container.js → app/javascript/flavours/glitch/containers/notification_purge_buttons_container.js View File

@@ -3,13 +3,13 @@ import { connect } from 'react-redux';
import { defineMessages, injectIntl } from 'react-intl';

// Our imports.
import NotificationPurgeButtons from 'themes/glitch/components/notification_purge_buttons';
import NotificationPurgeButtons from 'flavours/glitch/components/notification_purge_buttons';
import {
deleteMarkedNotifications,
enterNotificationClearingMode,
markAllNotifications,
} from 'themes/glitch/actions/notifications';
import { openModal } from 'themes/glitch/actions/modal';
} from 'flavours/glitch/actions/notifications';
import { openModal } from 'flavours/glitch/actions/modal';

const messages = defineMessages({
clearMessage: { id: 'notifications.marked_clear_confirmation', defaultMessage: 'Are you sure you want to permanently clear all selected notifications?' },

app/javascript/themes/glitch/containers/status_container.js → app/javascript/flavours/glitch/containers/status_container.js View File

@@ -1,11 +1,11 @@
import React from 'react';
import { connect } from 'react-redux';
import Status from 'themes/glitch/components/status';
import { makeGetStatus } from 'themes/glitch/selectors';
import Status from 'flavours/glitch/components/status';
import { makeGetStatus } from 'flavours/glitch/selectors';
import {
replyCompose,
mentionCompose,
} from 'themes/glitch/actions/compose';
} from 'flavours/glitch/actions/compose';
import {
reblog,
favourite,
@@ -13,14 +13,14 @@ import {
unfavourite,
pin,
unpin,
} from 'themes/glitch/actions/interactions';
import { blockAccount } from 'themes/glitch/actions/accounts';
import { muteStatus, unmuteStatus, deleteStatus } from 'themes/glitch/actions/statuses';
import { initMuteModal } from 'themes/glitch/actions/mutes';
import { initReport } from 'themes/glitch/actions/reports';
import { openModal } from 'themes/glitch/actions/modal';
} from 'flavours/glitch/actions/interactions';
import { blockAccount } from 'flavours/glitch/actions/accounts';
import { muteStatus, unmuteStatus, deleteStatus } from 'flavours/glitch/actions/statuses';
import { initMuteModal } from 'flavours/glitch/actions/mutes';
import { initReport } from 'flavours/glitch/actions/reports';
import { openModal } from 'flavours/glitch/actions/modal';
import { defineMessages, injectIntl, FormattedMessage } from 'react-intl';
import { boostModal, deleteModal } from 'themes/glitch/util/initial_state';
import { boostModal, deleteModal } from 'flavours/glitch/util/initial_state';

const messages = defineMessages({
deleteConfirm: { id: 'confirmations.delete.confirm', defaultMessage: 'Delete' },

app/javascript/themes/glitch/containers/timeline_container.js → app/javascript/flavours/glitch/containers/timeline_container.js View File

@@ -1,13 +1,13 @@
import React from 'react';
import { Provider } from 'react-redux';
import PropTypes from 'prop-types';
import configureStore from 'themes/glitch/store/configureStore';
import { hydrateStore } from 'themes/glitch/actions/store';
import configureStore from 'flavours/glitch/store/configureStore';
import { hydrateStore } from 'flavours/glitch/actions/store';
import { IntlProvider, addLocaleData } from 'react-intl';
import { getLocale } from 'mastodon/locales';
import PublicTimeline from 'themes/glitch/features/standalone/public_timeline';
import HashtagTimeline from 'themes/glitch/features/standalone/hashtag_timeline';
import initialState from 'themes/glitch/util/initial_state';
import PublicTimeline from 'flavours/glitch/features/standalone/public_timeline';
import HashtagTimeline from 'flavours/glitch/features/standalone/hashtag_timeline';
import initialState from 'flavours/glitch/util/initial_state';

const { localeData, messages } = getLocale();
addLocaleData(localeData);

app/javascript/themes/glitch/containers/video_container.js → app/javascript/flavours/glitch/containers/video_container.js View File

@@ -2,7 +2,7 @@ import React from 'react';
import PropTypes from 'prop-types';
import { IntlProvider, addLocaleData } from 'react-intl';
import { getLocale } from 'mastodon/locales';
import Video from 'themes/glitch/features/video';
import Video from 'flavours/glitch/features/video';

const { localeData, messages } = getLocale();
addLocaleData(localeData);

app/javascript/themes/glitch/features/account/components/action_bar.js → app/javascript/flavours/glitch/features/account/components/action_bar.js View File

@@ -1,10 +1,10 @@
import React from 'react';
import ImmutablePropTypes from 'react-immutable-proptypes';
import PropTypes from 'prop-types';
import DropdownMenuContainer from 'themes/glitch/containers/dropdown_menu_container';
import DropdownMenuContainer from 'flavours/glitch/containers/dropdown_menu_container';
import { Link } from 'react-router-dom';
import { defineMessages, injectIntl, FormattedMessage, FormattedNumber } from 'react-intl';
import { me } from 'themes/glitch/util/initial_state';
import { me } from 'flavours/glitch/util/initial_state';

const messages = defineMessages({
mention: { id: 'account.mention', defaultMessage: 'Mention @{name}' },

app/javascript/themes/glitch/features/account/components/header.js → app/javascript/flavours/glitch/features/account/components/header.js View File

@@ -4,12 +4,12 @@ import PropTypes from 'prop-types';
import { defineMessages, injectIntl, FormattedMessage } from 'react-intl';
import ImmutablePureComponent from 'react-immutable-pure-component';

import Avatar from 'themes/glitch/components/avatar';
import IconButton from 'themes/glitch/components/icon_button';
import Avatar from 'flavours/glitch/components/avatar';
import IconButton from 'flavours/glitch/components/icon_button';

import emojify from 'themes/glitch/util/emoji';
import { me } from 'themes/glitch/util/initial_state';
import { processBio } from 'themes/glitch/util/bio_metadata';
import emojify from 'flavours/glitch/util/emoji';
import { me } from 'flavours/glitch/util/initial_state';
import { processBio } from 'flavours/glitch/util/bio_metadata';

const messages = defineMessages({
unfollow: { id: 'account.unfollow', defaultMessage: 'Unfollow' },

app/javascript/themes/glitch/features/account_gallery/components/media_item.js → app/javascript/flavours/glitch/features/account_gallery/components/media_item.js View File

@@ -1,7 +1,7 @@
import React from 'react';
import ImmutablePropTypes from 'react-immutable-proptypes';
import ImmutablePureComponent from 'react-immutable-pure-component';
import Permalink from 'themes/glitch/components/permalink';
import Permalink from 'flavours/glitch/components/permalink';

export default class MediaItem extends ImmutablePureComponent {


app/javascript/themes/glitch/features/account_gallery/index.js → app/javascript/flavours/glitch/features/account_gallery/index.js View File

@@ -2,18 +2,18 @@ import React from 'react';
import { connect } from 'react-redux';
import ImmutablePropTypes from 'react-immutable-proptypes';
import PropTypes from 'prop-types';
import { fetchAccount } from 'themes/glitch/actions/accounts';
import { refreshAccountMediaTimeline, expandAccountMediaTimeline } from 'themes/glitch/actions/timelines';
import LoadingIndicator from 'themes/glitch/components/loading_indicator';
import Column from 'themes/glitch/features/ui/components/column';
import ColumnBackButton from 'themes/glitch/components/column_back_button';
import { fetchAccount } from 'flavours/glitch/actions/accounts';
import { refreshAccountMediaTimeline, expandAccountMediaTimeline } from 'flavours/glitch/actions/timelines';
import LoadingIndicator from 'flavours/glitch/components/loading_indicator';
import Column from 'flavours/glitch/features/ui/components/column';
import ColumnBackButton from 'flavours/glitch/components/column_back_button';
import ImmutablePureComponent from 'react-immutable-pure-component';
import { getAccountGallery } from 'themes/glitch/selectors';
import { getAccountGallery } from 'flavours/glitch/selectors';
import MediaItem from './components/media_item';
import HeaderContainer from 'themes/glitch/features/account_timeline/containers/header_container';
import HeaderContainer from 'flavours/glitch/features/account_timeline/containers/header_container';
import { FormattedMessage } from 'react-intl';
import { ScrollContainer } from 'react-router-scroll-4';
import LoadMore from 'themes/glitch/components/load_more';
import LoadMore from 'flavours/glitch/components/load_more';

const mapStateToProps = (state, props) => ({
medias: getAccountGallery(state, props.params.accountId),

app/javascript/themes/glitch/features/account_timeline/components/header.js → app/javascript/flavours/glitch/features/account_timeline/components/header.js View File

@@ -1,9 +1,9 @@
import React from 'react';
import ImmutablePropTypes from 'react-immutable-proptypes';
import PropTypes from 'prop-types';
import InnerHeader from 'themes/glitch/features/account/components/header';
import ActionBar from 'themes/glitch/features/account/components/action_bar';
import MissingIndicator from 'themes/glitch/components/missing_indicator';
import InnerHeader from 'flavours/glitch/features/account/components/header';
import ActionBar from 'flavours/glitch/features/account/components/action_bar';
import MissingIndicator from 'flavours/glitch/components/missing_indicator';
import ImmutablePureComponent from 'react-immutable-pure-component';

export default class Header extends ImmutablePureComponent {

app/javascript/themes/glitch/features/account_timeline/containers/header_container.js → app/javascript/flavours/glitch/features/account_timeline/containers/header_container.js View File

@@ -1,6 +1,6 @@
import React from 'react';
import { connect } from 'react-redux';
import { makeGetAccount } from 'themes/glitch/selectors';
import { makeGetAccount } from 'flavours/glitch/selectors';
import Header from '../components/header';
import {
followAccount,
@@ -8,14 +8,14 @@ import {
blockAccount,
unblockAccount,
unmuteAccount,
} from 'themes/glitch/actions/accounts';
import { mentionCompose } from 'themes/glitch/actions/compose';
import { initMuteModal } from 'themes/glitch/actions/mutes';
import { initReport } from 'themes/glitch/actions/reports';
import { openModal } from 'themes/glitch/actions/modal';
import { blockDomain, unblockDomain } from 'themes/glitch/actions/domain_blocks';
} from 'flavours/glitch/actions/accounts';
import { mentionCompose } from 'flavours/glitch/actions/compose';
import { initMuteModal } from 'flavours/glitch/actions/mutes';
import { initReport } from 'flavours/glitch/actions/reports';
import { openModal } from 'flavours/glitch/actions/modal';
import { blockDomain, unblockDomain } from 'flavours/glitch/actions/domain_blocks';
import { defineMessages, injectIntl, FormattedMessage } from 'react-intl';
import { unfollowModal } from 'themes/glitch/util/initial_state';
import { unfollowModal } from 'flavours/glitch/util/initial_state';

const messages = defineMessages({
unfollowConfirm: { id: 'confirmations.unfollow.confirm', defaultMessage: 'Unfollow' },

app/javascript/themes/glitch/features/account_timeline/index.js → app/javascript/flavours/glitch/features/account_timeline/index.js View File

@@ -2,8 +2,8 @@ import React from 'react';
import { connect } from 'react-redux';
import ImmutablePropTypes from 'react-immutable-proptypes';
import PropTypes from 'prop-types';
import { fetchAccount } from 'themes/glitch/actions/accounts';
import { refreshAccountTimeline, expandAccountTimeline } from 'themes/glitch/actions/timelines';
import { fetchAccount } from 'flavours/glitch/actions/accounts';
import { refreshAccountTimeline, expandAccountTimeline } from 'flavours/glitch/actions/timelines';
import StatusList from '../../components/status_list';
import LoadingIndicator from '../../components/loading_indicator';
import Column from '../ui/components/column';

app/javascript/themes/glitch/features/blocks/index.js → app/javascript/flavours/glitch/features/blocks/index.js View File

@@ -2,12 +2,12 @@ import React from 'react';
import { connect } from 'react-redux';
import ImmutablePropTypes from 'react-immutable-proptypes';
import PropTypes from 'prop-types';
import LoadingIndicator from 'themes/glitch/components/loading_indicator';
import LoadingIndicator from 'flavours/glitch/components/loading_indicator';
import { ScrollContainer } from 'react-router-scroll-4';
import Column from 'themes/glitch/features/ui/components/column';
import ColumnBackButtonSlim from 'themes/glitch/components/column_back_button_slim';
import AccountContainer from 'themes/glitch/containers/account_container';
import { fetchBlocks, expandBlocks } from 'themes/glitch/actions/blocks';
import Column from 'flavours/glitch/features/ui/components/column';
import ColumnBackButtonSlim from 'flavours/glitch/components/column_back_button_slim';
import AccountContainer from 'flavours/glitch/containers/account_container';
import { fetchBlocks, expandBlocks } from 'flavours/glitch/actions/blocks';
import { defineMessages, injectIntl } from 'react-intl';
import ImmutablePureComponent from 'react-immutable-pure-component';


app/javascript/themes/glitch/features/community_timeline/components/column_settings.js → app/javascript/flavours/glitch/features/community_timeline/components/column_settings.js View File

@@ -2,7 +2,7 @@ import React from 'react';
import PropTypes from 'prop-types';
import ImmutablePropTypes from 'react-immutable-proptypes';
import { defineMessages, injectIntl, FormattedMessage } from 'react-intl';
import SettingText from 'themes/glitch/components/setting_text';
import SettingText from 'flavours/glitch/components/setting_text';

const messages = defineMessages({
filter_regex: { id: 'home.column_settings.filter_regex', defaultMessage: 'Filter out by regular expressions' },

app/javascript/themes/glitch/features/community_timeline/containers/column_settings_container.js → app/javascript/flavours/glitch/features/community_timeline/containers/column_settings_container.js View File

@@ -1,6 +1,6 @@
import { connect } from 'react-redux';
import ColumnSettings from '../components/column_settings';
import { changeSetting } from 'themes/glitch/actions/settings';
import { changeSetting } from 'flavours/glitch/actions/settings';

const mapStateToProps = state => ({
settings: state.getIn(['settings', 'community']),

app/javascript/themes/glitch/features/community_timeline/index.js → app/javascript/flavours/glitch/features/community_timeline/index.js View File

@@ -1,17 +1,17 @@
import React from 'react';
import { connect } from 'react-redux';
import PropTypes from 'prop-types';
import StatusListContainer from 'themes/glitch/features/ui/containers/status_list_container';
import Column from 'themes/glitch/components/column';
import ColumnHeader from 'themes/glitch/components/column_header';
import StatusListContainer from 'flavours/glitch/features/ui/containers/status_list_container';
import Column from 'flavours/glitch/components/column';
import ColumnHeader from 'flavours/glitch/components/column_header';
import {
refreshCommunityTimeline,
expandCommunityTimeline,
} from 'themes/glitch/actions/timelines';
import { addColumn, removeColumn, moveColumn } from 'themes/glitch/actions/columns';
} from 'flavours/glitch/actions/timelines';
import { addColumn, removeColumn, moveColumn } from 'flavours/glitch/actions/columns';
import { defineMessages, injectIntl, FormattedMessage } from 'react-intl';
import ColumnSettingsContainer from './containers/column_settings_container';
import { connectCommunityStream } from 'themes/glitch/actions/streaming';
import { connectCommunityStream } from 'flavours/glitch/actions/streaming';

const messages = defineMessages({
title: { id: 'column.community', defaultMessage: 'Local timeline' },

app/javascript/themes/glitch/features/compose/components/advanced_options.js → app/javascript/flavours/glitch/features/compose/components/advanced_options.js View File


app/javascript/themes/glitch/features/compose/components/advanced_options_toggle.js → app/javascript/flavours/glitch/features/compose/components/advanced_options_toggle.js View File


app/javascript/themes/glitch/features/compose/components/attach_options.js → app/javascript/flavours/glitch/features/compose/components/attach_options.js View File

@@ -6,10 +6,10 @@ import { injectIntl, defineMessages } from 'react-intl';

// Our imports //
import ComposeDropdown from './dropdown';
import { uploadCompose } from 'themes/glitch/actions/compose';
import { uploadCompose } from 'flavours/glitch/actions/compose';
import ImmutablePropTypes from 'react-immutable-proptypes';
import ImmutablePureComponent from 'react-immutable-pure-component';
import { openModal } from 'themes/glitch/actions/modal';
import { openModal } from 'flavours/glitch/actions/modal';

const messages = defineMessages({
upload :

app/javascript/themes/glitch/features/compose/components/autosuggest_account.js → app/javascript/flavours/glitch/features/compose/components/autosuggest_account.js View File

@@ -1,6 +1,6 @@
import React from 'react';
import Avatar from 'themes/glitch/components/avatar';
import DisplayName from 'themes/glitch/components/display_name';
import Avatar from 'flavours/glitch/components/avatar';
import DisplayName from 'flavours/glitch/components/display_name';
import ImmutablePropTypes from 'react-immutable-proptypes';
import ImmutablePureComponent from 'react-immutable-pure-component';


app/javascript/themes/glitch/features/compose/components/character_counter.js → app/javascript/flavours/glitch/features/compose/components/character_counter.js View File


app/javascript/themes/glitch/features/compose/components/compose_form.js → app/javascript/flavours/glitch/features/compose/components/compose_form.js View File

@@ -1,12 +1,12 @@
import React from 'react';
import CharacterCounter from './character_counter';
import Button from 'themes/glitch/components/button';
import Button from 'flavours/glitch/components/button';
import ImmutablePropTypes from 'react-immutable-proptypes';
import PropTypes from 'prop-types';
import ReplyIndicatorContainer from '../containers/reply_indicator_container';
import AutosuggestTextarea from 'themes/glitch/components/autosuggest_textarea';
import AutosuggestTextarea from 'flavours/glitch/components/autosuggest_textarea';
import { defineMessages, injectIntl } from 'react-intl';
import Collapsable from 'themes/glitch/components/collapsable';
import Collapsable from 'flavours/glitch/components/collapsable';
import SpoilerButtonContainer from '../containers/spoiler_button_container';
import PrivacyDropdownContainer from '../containers/privacy_dropdown_container';
import ComposeAdvancedOptionsContainer from '../containers/advanced_options_container';
@@ -14,12 +14,12 @@ import SensitiveButtonContainer from '../containers/sensitive_button_container';
import EmojiPickerDropdown from '../containers/emoji_picker_dropdown_container';
import UploadFormContainer from '../containers/upload_form_container';
import WarningContainer from '../containers/warning_container';
import { isMobile } from 'themes/glitch/util/is_mobile';
import { isMobile } from 'flavours/glitch/util/is_mobile';
import ImmutablePureComponent from 'react-immutable-pure-component';
import { length } from 'stringz';
import { countableText } from 'themes/glitch/util/counter';
import { countableText } from 'flavours/glitch/util/counter';
import ComposeAttachOptions from './attach_options';
import initialState from 'themes/glitch/util/initial_state';
import initialState from 'flavours/glitch/util/initial_state';

const maxChars = initialState.max_toot_chars;


app/javascript/themes/glitch/features/compose/components/dropdown.js → app/javascript/flavours/glitch/features/compose/components/dropdown.js View File

@@ -3,7 +3,7 @@ import React from 'react';
import PropTypes from 'prop-types';

// Our imports.
import IconButton from 'themes/glitch/components/icon_button';
import IconButton from 'flavours/glitch/components/icon_button';

const iconStyle = {
height : null,

app/javascript/themes/glitch/features/compose/components/emoji_picker_dropdown.js → app/javascript/flavours/glitch/features/compose/components/emoji_picker_dropdown.js View File

@@ -1,12 +1,12 @@
import React from 'react';
import PropTypes from 'prop-types';
import { defineMessages, injectIntl } from 'react-intl';
import { EmojiPicker as EmojiPickerAsync } from 'themes/glitch/util/async-components';
import { EmojiPicker as EmojiPickerAsync } from 'flavours/glitch/util/async-components';
import Overlay from 'react-overlays/lib/Overlay';
import classNames from 'classnames';
import ImmutablePropTypes from 'react-immutable-proptypes';
import detectPassiveEvents from 'detect-passive-events';
import { buildCustomEmojis } from 'themes/glitch/util/emoji';
import { buildCustomEmojis } from 'flavours/glitch/util/emoji';

const messages = defineMessages({
emoji: { id: 'emoji_button.label', defaultMessage: 'Insert emoji' },

app/javascript/themes/glitch/features/compose/components/navigation_bar.js → app/javascript/flavours/glitch/features/compose/components/navigation_bar.js View File

@@ -1,9 +1,9 @@
import React from 'react';
import PropTypes from 'prop-types';
import ImmutablePropTypes from 'react-immutable-proptypes';
import Avatar from 'themes/glitch/components/avatar';
import IconButton from 'themes/glitch/components/icon_button';
import Permalink from 'themes/glitch/components/permalink';
import Avatar from 'flavours/glitch/components/avatar';
import IconButton from 'flavours/glitch/components/icon_button';
import Permalink from 'flavours/glitch/components/permalink';
import { FormattedMessage } from 'react-intl';
import ImmutablePureComponent from 'react-immutable-pure-component';


app/javascript/themes/glitch/features/compose/components/privacy_dropdown.js → app/javascript/flavours/glitch/features/compose/components/privacy_dropdown.js View File

@@ -1,9 +1,9 @@
import React from 'react';
import PropTypes from 'prop-types';
import { injectIntl, defineMessages } from 'react-intl';
import IconButton from 'themes/glitch/components/icon_button';
import IconButton from 'flavours/glitch/components/icon_button';
import Overlay from 'react-overlays/lib/Overlay';
import Motion from 'themes/glitch/util/optional_motion';
import Motion from 'flavours/glitch/util/optional_motion';
import spring from 'react-motion/lib/spring';
import detectPassiveEvents from 'detect-passive-events';
import classNames from 'classnames';

app/javascript/themes/glitch/features/compose/components/reply_indicator.js → app/javascript/flavours/glitch/features/compose/components/reply_indicator.js View File

@@ -1,9 +1,9 @@
import React from 'react';
import ImmutablePropTypes from 'react-immutable-proptypes';
import PropTypes from 'prop-types';
import Avatar from 'themes/glitch/components/avatar';
import IconButton from 'themes/glitch/components/icon_button';
import DisplayName from 'themes/glitch/components/display_name';
import Avatar from 'flavours/glitch/components/avatar';
import IconButton from 'flavours/glitch/components/icon_button';
import DisplayName from 'flavours/glitch/components/display_name';
import { defineMessages, injectIntl } from 'react-intl';
import ImmutablePureComponent from 'react-immutable-pure-component';


app/javascript/themes/glitch/features/compose/components/search.js → app/javascript/flavours/glitch/features/compose/components/search.js View File

@@ -2,7 +2,7 @@ import React from 'react';
import PropTypes from 'prop-types';
import { defineMessages, injectIntl, FormattedMessage } from 'react-intl';
import Overlay from 'react-overlays/lib/Overlay';
import Motion from 'themes/glitch/util/optional_motion';
import Motion from 'flavours/glitch/util/optional_motion';
import spring from 'react-motion/lib/spring';

const messages = defineMessages({

app/javascript/themes/glitch/features/compose/components/search_results.js → app/javascript/flavours/glitch/features/compose/components/search_results.js View File

@@ -1,8 +1,8 @@
import React from 'react';
import ImmutablePropTypes from 'react-immutable-proptypes';
import { FormattedMessage } from 'react-intl';
import AccountContainer from 'themes/glitch/containers/account_container';
import StatusContainer from 'themes/glitch/containers/status_container';
import AccountContainer from 'flavours/glitch/containers/account_container';
import StatusContainer from 'flavours/glitch/containers/status_container';
import { Link } from 'react-router-dom';
import ImmutablePureComponent from 'react-immutable-pure-component';


app/javascript/themes/glitch/features/compose/components/text_icon_button.js → app/javascript/flavours/glitch/features/compose/components/text_icon_button.js View File


app/javascript/themes/glitch/features/compose/components/upload.js → app/javascript/flavours/glitch/features/compose/components/upload.js View File

@@ -1,8 +1,8 @@
import React from 'react';
import ImmutablePropTypes from 'react-immutable-proptypes';
import PropTypes from 'prop-types';
import IconButton from 'themes/glitch/components/icon_button';
import Motion from 'themes/glitch/util/optional_motion';
import IconButton from 'flavours/glitch/components/icon_button';
import Motion from 'flavours/glitch/util/optional_motion';
import spring from 'react-motion/lib/spring';
import ImmutablePureComponent from 'react-immutable-pure-component';
import { defineMessages, injectIntl } from 'react-intl';

app/javascript/themes/glitch/features/compose/components/upload_button.js → app/javascript/flavours/glitch/features/compose/components/upload_button.js View File


Some files were not shown because too many files changed in this diff

Loading…
Cancel
Save