version

revert new dockerfile

.drone.yml

@@ -0,0 +1,33 @@
+kind: pipeline
+name: mastodon
+type: kubernetes
+
+steps:
+- name: build-mastodon
+  image: plugins/docker
+  environment:		
+    DOCKER_BUILDKIT: 1
+  settings:
+    registry: git.greyfox.tech
+    username:
+      from_secret: registry_user
+    password:
+      from_secret: registry_pass
+    repo: git.greyfox.tech/bark/mastodon
+    dockerfile: Dockerfile
+    tags:
+      - prod
+- name: build-streaming
+  image: plugins/docker
+  environment:		
+    DOCKER_BUILDKIT: 1
+  settings:
+    registry: git.greyfox.tech
+    username:
+      from_secret: registry_user
+    password:
+      from_secret: registry_pass
+    repo: git.greyfox.tech/bark/mastodon-streaming
+    dockerfile: streaming/Dockerfile
+    tags:
+      - prod

Dockerfile

@@ -26,13 +26,13 @@ FROM docker.io/ruby:${RUBY_VERSION}-slim-${DEBIAN_VERSION} AS ruby
 # Resulting version string is vX.X.X-MASTODON_VERSION_PRERELEASE+MASTODON_VERSION_METADATA
 # Example: v4.3.0-nightly.2023.11.09+pr-123456
 # Overwrite existence of 'alpha.X' in version.rb [--build-arg MASTODON_VERSION_PRERELEASE="nightly.2023.11.09"]
-ARG MASTODON_VERSION_PRERELEASE=""
+ARG MASTODON_VERSION_PRERELEASE="bark"
 # Append build metadata or fork information to version.rb [--build-arg MASTODON_VERSION_METADATA="pr-123456"]
-ARG MASTODON_VERSION_METADATA=""
+ARG MASTODON_VERSION_METADATA="05-12-2024"
 # Will be available as Mastodon::Version.source_commit
 ARG SOURCE_COMMIT=""
 
-# Allow Ruby on Rails to serve static files
+# Allow Ruby on Rails to serve statiprodc files
 # See: https://docs.joinmastodon.org/admin/config/#rails_serve_static_files
 ARG RAILS_SERVE_STATIC_FILES="true"
 # Allow to use YJIT compiler

app/javascript/mastodon/features/ui/components/link_footer.jsx

@@ -74,14 +74,19 @@ class LinkFooter extends PureComponent {
         </p>
 
         <p>
-          <strong>Mastodon</strong>:
+          <strong>Bark services</strong>:
           {' '}
-          <a href='https://joinmastodon.org' target='_blank'><FormattedMessage id='footer.about' defaultMessage='About' /></a>
-          {DividingCircle}
-          <a href='https://joinmastodon.org/apps' target='_blank'><FormattedMessage id='footer.get_app' defaultMessage='Get the app' /></a>
-          {DividingCircle}
-          <Link to='/keyboard-shortcuts'><FormattedMessage id='footer.keyboard_shortcuts' defaultMessage='Keyboard shortcuts' /></Link>
+          {statusPageUrl && (
+            <>
               {DividingCircle}
+              <a href={statusPageUrl} target='_blank' rel='noopener'><FormattedMessage id='footer.status' defaultMessage='Status' /></a>
+            </>
+          )}
+          {' · '}
+          <a href='https://chat.bark.lgbt' target='_blank'><FormattedMessage id='footer.matrix' defaultMessage='Matrix' /></a>
+          {' · '}
+          <a href='https://bark.video' target='_blank'><FormattedMessage id='footer.peertube' defaultMessage='Peertube' /></a>
+          {' · '}
           <a href={source_url} rel='noopener noreferrer' target='_blank'><FormattedMessage id='footer.source_code' defaultMessage='View source code' /></a>
           {DividingCircle}
           <span className='version'>v{version}</span>

app/javascript/mastodon/features/ui/components/navigation_panel.jsx

@@ -28,6 +28,7 @@ import SearchIcon from '@/material-icons/400-24px/search.svg?react';
 import SettingsIcon from '@/material-icons/400-24px/settings.svg?react';
 import StarActiveIcon from '@/material-icons/400-24px/star-fill.svg?react';
 import StarIcon from '@/material-icons/400-24px/star.svg?react';
+import FurryIcon from '@/material-icons/400-24px/pets.svg?react';
 import { fetchFollowRequests } from 'mastodon/actions/accounts';
 import { IconWithBadge } from 'mastodon/components/icon_with_badge';
 import { WordmarkLogo } from 'mastodon/components/logo';
@@ -48,6 +49,7 @@ const messages = defineMessages({
   notifications: { id: 'tabs_bar.notifications', defaultMessage: 'Notifications' },
   explore: { id: 'explore.title', defaultMessage: 'Explore' },
   firehose: { id: 'column.firehose', defaultMessage: 'Live feeds' },
+  furry: { id: 'tabs_bar.furry', defaultMessage: 'Furry' },
   direct: { id: 'navigation_bar.direct', defaultMessage: 'Private mentions' },
   favourites: { id: 'navigation_bar.favourites', defaultMessage: 'Favorites' },
   bookmarks: { id: 'navigation_bar.bookmarks', defaultMessage: 'Bookmarks' },
@@ -160,7 +162,10 @@ class NavigationPanel extends Component {
           )}
 
           {(signedIn || timelinePreview) && (
+            <>
             <ColumnLink transparent to='/public/local' isActive={this.isFirehoseActive} icon='globe' iconComponent={PublicIcon} text={intl.formatMessage(messages.firehose)} />
+            <ColumnLink transparent to='/tags/furry' icon='pets' iconComponent={FurryIcon} text={intl.formatMessage(messages.furry)} />
+            </>
           )}
 
           {!signedIn && (

app/javascript/material-icons/400-24px/pets.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="24" viewBox="0 -960 960 960" width="24"><path d="M180-475q-42 0-71-29t-29-71q0-42 29-71t71-29q42 0 71 29t29 71q0 42-29 71t-71 29Zm180-160q-42 0-71-29t-29-71q0-42 29-71t71-29q42 0 71 29t29 71q0 42-29 71t-71 29Zm240 0q-42 0-71-29t-29-71q0-42 29-71t71-29q42 0 71 29t29 71q0 42-29 71t-71 29Zm180 160q-42 0-71-29t-29-71q0-42 29-71t71-29q42 0 71 29t29 71q0 42-29 71t-71 29ZM266-75q-45 0-75.5-34.5T160-191q0-52 35.5-91t70.5-77q29-31 50-67.5t50-68.5q22-26 51-43t63-17q34 0 63 16t51 42q28 32 49.5 69t50.5 69q35 38 70.5 77t35.5 91q0 47-30.5 81.5T694-75q-54 0-107-9t-107-9q-54 0-107 9t-107 9Z"/></svg>

app/models/account.rb

@@ -67,7 +67,7 @@ class Account < ApplicationRecord
   BACKGROUND_REFRESH_INTERVAL = 1.week.freeze
   REFRESH_DEADLINE = 6.hours
   STALE_THRESHOLD = 1.day
-  DEFAULT_FIELDS_SIZE = 4
+  DEFAULT_FIELDS_SIZE = 8
   INSTANCE_ACTOR_ID = -99
 
   USERNAME_RE   = /[a-z0-9_]+([.-]+[a-z0-9_]+)*/i
@@ -76,7 +76,7 @@ class Account < ApplicationRecord
   USERNAME_ONLY_RE = /\A#{USERNAME_RE}\z/i
   USERNAME_LENGTH_LIMIT = 30
   DISPLAY_NAME_LENGTH_LIMIT = 30
-  NOTE_LENGTH_LIMIT = 500
+  NOTE_LENGTH_LIMIT = 1000
 
   AUTOMATED_ACTOR_TYPES = %w(Application Service).freeze
 

app/models/trends/statuses.rb

@@ -8,7 +8,7 @@ class Trends::Statuses < Trends::Base
   self.default_options = {
     threshold: 5,
     review_threshold: 3,
-    score_halflife: 1.hour.freeze,
+    score_halflife: 2.hours.freeze,
     decay_threshold: 0.3,
   }
 

app/validators/status_length_validator.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 class StatusLengthValidator < ActiveModel::Validator
-  MAX_CHARS = 500
+  MAX_CHARS = 1000
   URL_PLACEHOLDER_CHARS = 23
   URL_PLACEHOLDER = 'x' * 23
 

config/sidekiq.yml

@@ -60,7 +60,7 @@
       class: Scheduler::SuspendedUserCleanupScheduler
       queue: scheduler
     software_update_check_scheduler:
-      interval: 30 minutes
+      interval: 60 minutes
       class: Scheduler::SoftwareUpdateCheckScheduler
       queue: scheduler
     auto_close_registrations_scheduler:

lib/mastodon/version.rb

@@ -50,11 +50,11 @@ module Mastodon
     end
 
     def repository
-      ENV.fetch('GITHUB_REPOSITORY', 'mastodon/mastodon')
+      ENV.fetch('GITHUB_REPOSITORY', 'bark/mastodon')
     end
 
     def source_base_url
-      ENV.fetch('SOURCE_BASE_URL', "https://github.com/#{repository}")
+      ENV.fetch('SOURCE_BASE_URL', "https://git.greyfox.tech/#{repository}")
     end
 
     # specify git tag or commit hash here