');
- expect(emojify('👨â€ðŸ‘©â€ðŸ‘§â€ðŸ‘§')).toEqual(
- '
');
- expect(emojify('👩â€ðŸ‘©â€ðŸ‘¦')).toEqual('
');
- expect(emojify('\u2757')).toEqual(
- '
');
- });
-
- it('does multiple unicode', () => {
- expect(emojify('\u2757 #\uFE0F\u20E3')).toEqual(
- ' 
');
- expect(emojify('\u2757#\uFE0F\u20E3')).toEqual(
- '');
- expect(emojify('\u2757 #\uFE0F\u20E3 \u2757')).toEqual(
- ' ');
- expect(emojify('foo \u2757 #\uFE0F\u20E3 bar')).toEqual(
- 'foo bar');
- });
-
- it('ignores unicode inside of tags', () => {
- expect(emojify('')).toEqual('');
- });
-
- it('does multiple emoji properly (issue 5188)', () => {
- expect(emojify('👌🌈💕')).toEqual('
');
- expect(emojify('👌 🌈 💕')).toEqual(' ');
- });
-
- it('does an emoji that has no shortcode', () => {
- expect(emojify('ðŸ‘â€ðŸ—¨')).toEqual('
');
- });
-
- it('does an emoji whose filename is irregular', () => {
- expect(emojify('↙ï¸')).toEqual('
');
- });
-
- it('avoid emojifying on invisible text', () => {
- expect(emojify('http://example.com/test😄'))
- .toEqual('http://example.com/test😄');
- expect(emojify(':luigi:', { ':luigi:': { static_url: 'luigi.exe' } }))
- .toEqual(':luigi:');
- });
-
- it('avoid emojifying on invisible text with nested tags', () => {
- expect(emojify('😄bar😴😇'))
- .toEqual('😄bar😴
');
- expect(emojify('😄😕😴😇'))
- .toEqual('😄😕😴');
- expect(emojify('😄😴😇')) - .toEqual('😄
😴
');
- });
-
- it('skips the textual presentation VS15 character', () => {
- expect(emojify('✴︎')) // This is U+2734 EIGHT POINTED BLACK STAR then U+FE0E VARIATION SELECTOR-15
- .toEqual('
');
- });
- });
-});
diff --git a/app/javascript/gabsocial/components/emoji/__tests__/emoji_index-test.js b/app/javascript/gabsocial/components/emoji/__tests__/emoji_index-test.js
deleted file mode 100644
index 849502d7..00000000
--- a/app/javascript/gabsocial/components/emoji/__tests__/emoji_index-test.js
+++ /dev/null
@@ -1,176 +0,0 @@
-import pick from 'lodash.pick'
-import { emojiIndex } from 'emoji-mart';
-import { search } from '../emoji_mart_search_light';
-
-const trimEmojis = emoji => pick(emoji, ['id', 'unified', 'native', 'custom']);
-
-describe('emoji_index', () => {
- it('should give same result for emoji_index_light and emoji-mart', () => {
- const expected = [
- {
- id: 'pineapple',
- unified: '1f34d',
- native: 'ðŸ',
- },
- ];
- expect(search('pineapple').map(trimEmojis)).toEqual(expected);
- expect(emojiIndex.search('pineapple').map(trimEmojis)).toEqual(expected);
- });
-
- it('orders search results correctly', () => {
- const expected = [
- {
- id: 'apple',
- unified: '1f34e',
- native: 'ðŸŽ',
- },
- {
- id: 'pineapple',
- unified: '1f34d',
- native: 'ðŸ',
- },
- {
- id: 'green_apple',
- unified: '1f34f',
- native: 'ðŸ',
- },
- {
- id: 'iphone',
- unified: '1f4f1',
- native: '📱',
- },
- ];
- expect(search('apple').map(trimEmojis)).toEqual(expected);
- expect(emojiIndex.search('apple').map(trimEmojis)).toEqual(expected);
- });
-
- it('can include/exclude categories', () => {
- expect(search('flag', { include: ['people'] })).toEqual([]);
- expect(emojiIndex.search('flag', { include: ['people'] })).toEqual([]);
- });
-
- it('(different behavior from emoji-mart) do not erases custom emoji if not passed again', () => {
- const custom = [
- {
- id: 'gabsocial',
- name: 'gabsocial',
- short_names: ['gabsocial'],
- text: '',
- emoticons: [],
- keywords: ['gabsocial'],
- imageUrl: 'http://example.com',
- custom: true,
- },
- ];
- search('', { custom });
- emojiIndex.search('', { custom });
- const expected = [];
- const lightExpected = [
- {
- id: 'gabsocial',
- custom: true,
- },
- ];
- expect(search('masto').map(trimEmojis)).toEqual(lightExpected);
- expect(emojiIndex.search('masto').map(trimEmojis)).toEqual(expected);
- });
-
- it('(different behavior from emoji-mart) erases custom emoji if another is passed', () => {
- const custom = [
- {
- id: 'gabsocial',
- name: 'gabsocial',
- short_names: ['gabsocial'],
- text: '',
- emoticons: [],
- keywords: ['gabsocial'],
- imageUrl: 'http://example.com',
- custom: true,
- },
- ];
- search('', { custom });
- emojiIndex.search('', { custom });
- const expected = [];
- expect(search('masto', { custom: [] }).map(trimEmojis)).toEqual(expected);
- expect(emojiIndex.search('masto').map(trimEmojis)).toEqual(expected);
- });
-
- it('handles custom emoji', () => {
- const custom = [
- {
- id: 'gabsocial',
- name: 'gabsocial',
- short_names: ['gabsocial'],
- text: '',
- emoticons: [],
- keywords: ['gabsocial'],
- imageUrl: 'http://example.com',
- custom: true,
- },
- ];
- search('', { custom });
- emojiIndex.search('', { custom });
- const expected = [
- {
- id: 'gabsocial',
- custom: true,
- },
- ];
- expect(search('masto', { custom }).map(trimEmojis)).toEqual(expected);
- expect(emojiIndex.search('masto', { custom }).map(trimEmojis)).toEqual(expected);
- });
-
- it('should filter only emojis we care about, exclude pineapple', () => {
- const emojisToShowFilter = emoji => emoji.unified !== '1F34D';
- expect(search('apple', { emojisToShowFilter }).map((obj) => obj.id))
- .not.toContain('pineapple');
- expect(emojiIndex.search('apple', { emojisToShowFilter }).map((obj) => obj.id))
- .not.toContain('pineapple');
- });
-
- it('does an emoji whose unified name is irregular', () => {
- const expected = [
- {
- 'id': 'water_polo',
- 'unified': '1f93d',
- 'native': '🤽',
- },
- {
- 'id': 'man-playing-water-polo',
- 'unified': '1f93d-200d-2642-fe0f',
- 'native': '🤽â€â™‚ï¸',
- },
- {
- 'id': 'woman-playing-water-polo',
- 'unified': '1f93d-200d-2640-fe0f',
- 'native': '🤽â€â™€ï¸',
- },
- ];
- expect(search('polo').map(trimEmojis)).toEqual(expected);
- expect(emojiIndex.search('polo').map(trimEmojis)).toEqual(expected);
- });
-
- it('can search for thinking_face', () => {
- const expected = [
- {
- id: 'thinking_face',
- unified: '1f914',
- native: '🤔',
- },
- ];
- expect(search('thinking_fac').map(trimEmojis)).toEqual(expected);
- expect(emojiIndex.search('thinking_fac').map(trimEmojis)).toEqual(expected);
- });
-
- it('can search for woman-facepalming', () => {
- const expected = [
- {
- id: 'woman-facepalming',
- unified: '1f926-200d-2640-fe0f',
- native: '🤦â€â™€ï¸',
- },
- ];
- expect(search('woman-facep').map(trimEmojis)).toEqual(expected);
- expect(emojiIndex.search('woman-facep').map(trimEmojis)).toEqual(expected);
- });
-});
diff --git a/app/javascript/gabsocial/components/image.js b/app/javascript/gabsocial/components/image.js
index 9d29e758..0906d15a 100644
--- a/app/javascript/gabsocial/components/image.js
+++ b/app/javascript/gabsocial/components/image.js
@@ -54,7 +54,7 @@ class Image extends React.PureComponent {
-
- {intl.formatMessage(messages.instructions)}
-
-
-
- {intl.formatMessage(messages.preview)}
-
-
-
-
-
-
-
-
-
- {
- !oembed &&
-
-
-
+
+ )
+ }
+
+}
+
+Toast.propTypes = {
+ date: PropTypes.string.isRequired,
+ image: PropTypes.string,
+ isImageAccount: PropTypes.bool,
+ id: PropTypes.string.isRequired,
+ message: PropTypes.string.isRequired,
+ onDismiss: PropTypes.func.isRequired,
+ title: PropTypes.string.isRequired,
+ to: PropTypes.string,
+ type: PropTypes.oneOf([
+ TOAST_TYPE_ERROR,
+ TOAST_TYPE_SUCCESS,
+ ]).isRequired,
+}
+
+export default Toast
\ No newline at end of file
diff --git a/app/javascript/gabsocial/constants.js b/app/javascript/gabsocial/constants.js
index 678272f3..42c517f8 100644
--- a/app/javascript/gabsocial/constants.js
+++ b/app/javascript/gabsocial/constants.js
@@ -11,6 +11,8 @@ export const BREAKPOINT_MEDIUM = 1160
export const BREAKPOINT_SMALL = 1080
export const BREAKPOINT_EXTRA_SMALL = 992
+export const LAZY_LOAD_SCROLL_OFFSET = 50
+
export const ALLOWED_AROUND_SHORT_CODE = '><\u0085\u0020\u00a0\u1680\u2000\u2001\u2002\u2003\u2004\u2005\u2006\u2007\u2008\u2009\u200a\u202f\u205f\u3000\u2028\u2029\u0009\u000a\u000b\u000c\u000d'
export const MAX_POST_CHARACTER_COUNT = 3000
@@ -48,7 +50,6 @@ export const MODAL_DISPLAY_OPTIONS = 'DISPLAY_OPTIONS'
export const MODAL_EDIT_PROFILE = 'EDIT_PROFILE'
export const MODAL_EDIT_SHORTCUTS = 'EDIT_SHORTCUTS'
export const MODAL_EMAIL_CONFIRMATION_REMINDER = 'EMAIL_CONFIRMATION_REMINDER'
-export const MODAL_EMBED = 'EMBED'
export const MODAL_GROUP_CREATE = 'GROUP_CREATE'
export const MODAL_GROUP_DELETE = 'GROUP_DELETE'
export const MODAL_GROUP_PASSWORD = 'GROUP_PASSWORD'
diff --git a/app/javascript/gabsocial/containers/toasts_container.js b/app/javascript/gabsocial/containers/toasts_container.js
new file mode 100644
index 00000000..c497c828
--- /dev/null
+++ b/app/javascript/gabsocial/containers/toasts_container.js
@@ -0,0 +1,67 @@
+import React from 'react'
+import PropTypes from 'prop-types'
+import { connect } from 'react-redux'
+import { getToasts } from '../selectors'
+import { dismissToast } from '../actions/toasts'
+import { CX } from '../constants'
+import Toast from '../components/toast'
+
+class ToastsContainer extends React.PureComponent {
+
+ handleOnDismiss = (key) => {
+ this.props.dispatch(dismissToast(key))
+ }
+
+ render() {
+ const { notifications } = this.props
+ const hasNotifications = Array.isArray(notifications) && notifications.length > 0
+
+ const containerClasses = CX({
+ default: 1,
+ z5: 1,
+ posFixed: 1,
+ bottom0: 1,
+ left0: 1,
+ pl15: 1,
+ pt15: 1,
+ heightMax100VH: 1,
+ pb10: 1,
+ displayNone: !hasNotifications
+ })
+
+ return (
+
+
+ {title}
+
+
+
+
+ {
+ !!image &&
+
+
+
+ {message}
+
+ {
+ date &&
+
+
+ }
+
+
+ {
+ hasNotifications && notifications.map((notification) => (
+
+ )
+
+ }
+
+}
+
+const mapStateToProps = (state) => {
+ const notifications = getToasts(state)
+ if (!notifications) return {}
+ return { notifications }
+}
+
+ToastsContainer.propTypes = {
+ notifications: PropTypes.array,
+}
+
+export default connect(mapStateToProps)(ToastsContainer)
\ No newline at end of file
diff --git a/app/javascript/gabsocial/features/introduction.js b/app/javascript/gabsocial/features/introduction.js
index e3b608f3..dfff01e2 100644
--- a/app/javascript/gabsocial/features/introduction.js
+++ b/app/javascript/gabsocial/features/introduction.js
@@ -10,7 +10,7 @@ import {
GAB_COM_INTRODUCE_YOURSELF_GROUP_ID,
} from '../constants'
import { me } from '../initial_state'
-import { saveShownOnboarding } from '../actions/onboarding'
+import { saveShownOnboarding } from '../actions/settings'
import { fetchGroups } from '../actions/groups'
import { saveUserProfileInformation } from '../actions/user'
import { makeGetAccount } from '../selectors'
diff --git a/app/javascript/gabsocial/features/list_timeline.js b/app/javascript/gabsocial/features/list_timeline.js
index 3dc52f54..a3bfca76 100644
--- a/app/javascript/gabsocial/features/list_timeline.js
+++ b/app/javascript/gabsocial/features/list_timeline.js
@@ -4,7 +4,6 @@ import { connect } from 'react-redux'
import ImmutablePropTypes from 'react-immutable-proptypes'
import ImmutablePureComponent from 'react-immutable-pure-component'
import { FormattedMessage } from 'react-intl'
-import { connectListStream } from '../actions/streaming'
import { expandListTimeline } from '../actions/timelines'
import { fetchList, deleteList } from '../actions/lists'
import { openModal } from '../actions/modal'
@@ -29,7 +28,6 @@ class ListTimeline extends ImmutablePureComponent {
componentWillReceiveProps(nextProps) {
if (nextProps.params.id !== this.props.params.id) {
- this.handleDisconnect()
this.handleConnect(nextProps.params.id)
}
}
@@ -39,15 +37,6 @@ class ListTimeline extends ImmutablePureComponent {
dispatch(fetchList(id))
dispatch(expandListTimeline(id))
-
- this.disconnect = dispatch(connectListStream(id))
- }
-
- handleDisconnect() {
- if (this.disconnect) {
- this.disconnect()
- this.disconnect = null
- }
}
handleLoadMore = (maxId) => {
diff --git a/app/javascript/gabsocial/features/messages/components/message_item.js b/app/javascript/gabsocial/features/messages/components/message_item.js
new file mode 100644
index 00000000..85a739f1
--- /dev/null
+++ b/app/javascript/gabsocial/features/messages/components/message_item.js
@@ -0,0 +1,116 @@
+import React from 'react'
+import PropTypes from 'prop-types'
+import { connect } from 'react-redux'
+import ImmutablePureComponent from 'react-immutable-pure-component'
+import ImmutablePropTypes from 'react-immutable-proptypes'
+import { NavLink } from 'react-router-dom'
+import { CX } from '../../../constants'
+import Input from '../../../components/input'
+import Avatar from '../../../components/avatar'
+import Button from '../../../components/button'
+import Text from '../../../components/text'
+import RelativeTimestamp from '../../../components/relative_timestamp'
+import { makeGetAccount } from '../../../selectors'
+
+class MessagesItem extends ImmutablePureComponent {
+
+ static contextTypes = {
+ router: PropTypes.object,
+ }
+
+ state = {
+ hovering: false,
+ }
+
+ handleOnMouseEnter = () => {
+ this.setState({ isHovering: true })
+ }
+
+ handleOnMouseLeave = () => {
+ this.setState({ isHovering: false })
+ }
+
+ render() {
+ const {
+ account,
+ intl,
+ alt,
+ } = this.props
+ const { isHovering } = this.state
+
+ const content = { __html: 'REEEE i heard you have the sauce2?' }
+ const messageContainerClasses = CX({
+ d: 1,
+ flexRow: !alt,
+ flexRowReverse: alt,
+ })
+ const messageInnerContainerClasses = CX({
+ d: 1,
+ px15: 1,
+ py5: 1,
+ bgSecondary: !alt,
+ bgBrandLight: alt,
+ circle: 1,
+ ml10: 1,
+ mr10: 1,
+ })
+
+ const lowerContainerClasses = CX({
+ d: 1,
+ pt10: 1,
+ pl50: !alt,
+ pr50: alt,
+ })
+
+ const buttonContainerClasses = CX({
+ d: 1,
+ flexRow: 1,
+ displayNone: !isHovering,
+ })
+
+ return (
+
+
+ )
+ }
+
+}
+
+const mapStateToProps = (state, props) => ({
+ account: makeGetAccount()(state, '1'),
+})
+
+MessagesItem.propTypes = {
+ intl: PropTypes.object.isRequired,
+ alt: PropTypes.bool,
+}
+
+export default connect(mapStateToProps)(MessagesItem)
\ No newline at end of file
diff --git a/app/javascript/gabsocial/features/messages/components/messages_header.js b/app/javascript/gabsocial/features/messages/components/messages_header.js
new file mode 100644
index 00000000..1d51fcf4
--- /dev/null
+++ b/app/javascript/gabsocial/features/messages/components/messages_header.js
@@ -0,0 +1,47 @@
+import React from 'react'
+import PropTypes from 'prop-types'
+import { connect } from 'react-redux'
+import ImmutablePureComponent from 'react-immutable-pure-component'
+import ImmutablePropTypes from 'react-immutable-proptypes'
+import Heading from '../../../components/heading'
+import Button from '../../../components/button'
+
+class MessagesHeader extends ImmutablePureComponent {
+
+ render() {
+ const {
+ account,
+ } = this.props
+
+ return (
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Apr 16, 2020, 8:20 AM
+ { /*
+
+
+
+ )
+ }
+
+}
+
+export default MessagesHeader
\ No newline at end of file
diff --git a/app/javascript/gabsocial/features/messages/components/messages_list.js b/app/javascript/gabsocial/features/messages/components/messages_list.js
new file mode 100644
index 00000000..4fea864d
--- /dev/null
+++ b/app/javascript/gabsocial/features/messages/components/messages_list.js
@@ -0,0 +1,36 @@
+import React from 'react'
+import PropTypes from 'prop-types'
+import { connect } from 'react-redux'
+import ImmutablePureComponent from 'react-immutable-pure-component'
+import ImmutablePropTypes from 'react-immutable-proptypes'
+import MessagesListItem from './messages_list_item'
+import { makeGetAccount } from '../../../selectors'
+
+class MessagesList extends ImmutablePureComponent {
+
+ render() {
+ const {
+ account,
+ } = this.props
+
+ return (
+
+
+ Messages
+
+
+
+
+
+
+
+
+ )
+ }
+
+}
+
+const mapStateToProps = (state, props) => ({
+ account: makeGetAccount()(state, '1'),
+})
+
+MessagesList.propTypes = {
+ intl: PropTypes.object.isRequired,
+}
+
+export default connect(mapStateToProps)(MessagesList)
\ No newline at end of file
diff --git a/app/javascript/gabsocial/features/messages/components/messages_list_item.js b/app/javascript/gabsocial/features/messages/components/messages_list_item.js
new file mode 100644
index 00000000..36cf40b2
--- /dev/null
+++ b/app/javascript/gabsocial/features/messages/components/messages_list_item.js
@@ -0,0 +1,107 @@
+import React from 'react'
+import PropTypes from 'prop-types'
+import { connect } from 'react-redux'
+import ImmutablePureComponent from 'react-immutable-pure-component'
+import ImmutablePropTypes from 'react-immutable-proptypes'
+import { NavLink } from 'react-router-dom'
+import { CX } from '../../../constants'
+import Input from '../../../components/input'
+import DisplayName from '../../../components/display_name'
+import Avatar from '../../../components/avatar'
+import Text from '../../../components/text'
+import RelativeTimestamp from '../../../components/relative_timestamp'
+import { makeGetAccount } from '../../../selectors'
+
+class MessagesListItem extends ImmutablePureComponent {
+
+ static contextTypes = {
+ router: PropTypes.object,
+ }
+
+ state = {
+ composeFocused: false,
+ }
+
+ render() {
+ const {
+ account,
+ intl,
+ selected,
+ } = this.props
+
+ const buttonClasses = CX({
+ d: 1,
+ pt2: 1,
+ pr5: 1,
+ noUnderline: 1,
+ overflowHidden: 1,
+ flexNormal: 1,
+ flexRow: 1,
+ aiStart: 1,
+ aiCenter: 1,
+ })
+
+ const containerClasses = CX({
+ d: 1,
+ bgSubtle_onHover: 1,
+ borderBottom1PX: 1,
+ borderColorSecondary: 1,
+ noUnderline: 1,
+ })
+
+ const innerContainerClasses = CX({
+ d: 1,
+ flexRow: 1,
+ aiStart: 1,
+ aiCenter: 0,
+ px15: 1,
+ py15: 1,
+ borderRight4PX: selected,
+ borderColorBrand: selected,
+ })
+
+ const avatarSize = 49
+ const content = { __html: 'REEEE i heard you have the sauce?' }
+
+ return (
+
+
+
+
+
+
+
+
+
+
+
+ May 1
+ { /*
+
+
+
+
+
+
+ )
+ }
+
+}
+
+const messages = defineMessages({
+ placeholder: { id: 'compose_form.placeholder', defaultMessage: "What's on your mind?" },
+})
+
+MessagesSearch.propTypes = {
+ intl: PropTypes.object.isRequired,
+}
+
+export default injectIntl(MessagesSearch)
\ No newline at end of file
diff --git a/app/javascript/gabsocial/features/messages/index.js b/app/javascript/gabsocial/features/messages/index.js
new file mode 100644
index 00000000..508230fe
--- /dev/null
+++ b/app/javascript/gabsocial/features/messages/index.js
@@ -0,0 +1 @@
+export { default } from './messages'
\ No newline at end of file
diff --git a/app/javascript/gabsocial/features/messages/messages.js b/app/javascript/gabsocial/features/messages/messages.js
new file mode 100644
index 00000000..434e1607
--- /dev/null
+++ b/app/javascript/gabsocial/features/messages/messages.js
@@ -0,0 +1,103 @@
+import React from 'react'
+import PropTypes from 'prop-types'
+import { connect } from 'react-redux'
+import { makeGetAccount } from '../../selectors'
+import Text from '../../components/text'
+import Button from '../../components/button'
+import Avatar from '../../components/avatar'
+import DisplayName from '../../components/display_name'
+import Input from '../../components/input'
+import EmojiPickerButton from '../compose/components/emoji_picker_button'
+import UploadButton from '../compose/components/media_upload_button'
+import MessageItem from './components/message_item'
+
+// import MessagesContainer from './containers/messages_container'
+
+class Messages extends React.PureComponent {
+
+ render () {
+ const { account } = this.props
+
+ const selectedMessage = true
+
+ return (
+
+ {
+ !selectedMessage &&
+
+ )
+ }
+
+}
+
+const mapStateToProps = (state, props) => ({
+ account: makeGetAccount()(state, '1'),
+})
+
+Messages.propTypes = {
+ intl: PropTypes.object.isRequired,
+ selected: PropTypes.bool,
+}
+
+export default connect(mapStateToProps)(Messages)
\ No newline at end of file
diff --git a/app/javascript/gabsocial/features/news.js b/app/javascript/gabsocial/features/news.js
index f2934fc2..067627cc 100644
--- a/app/javascript/gabsocial/features/news.js
+++ b/app/javascript/gabsocial/features/news.js
@@ -3,7 +3,10 @@ import PropTypes from 'prop-types'
import { connect } from 'react-redux'
import throttle from 'lodash.throttle'
import { fetchPopularLinks } from '../actions/links'
-import { BREAKPOINT_EXTRA_SMALL } from '../constants'
+import {
+ BREAKPOINT_EXTRA_SMALL,
+ LAZY_LOAD_SCROLL_OFFSET,
+} from '../constants'
import Button from '../components/button'
import Text from '../components/text'
import TrendsItem from '../components/trends_item'
@@ -46,14 +49,12 @@ class News extends React.PureComponent {
if (this.window) {
const { scrollTop } = this.documentElement
- if (scrollTop > 25 && !this.state.lazyLoaded) {
+ if (scrollTop > LAZY_LOAD_SCROLL_OFFSET && !this.state.lazyLoaded) {
this.setState({ lazyLoaded: true })
this.detachScrollListener()
}
}
- }, 150, {
- trailing: true,
- })
+ }, 150, { trailing: true })
render() {
const { children } = this.props
diff --git a/app/javascript/gabsocial/features/pro_timeline.js b/app/javascript/gabsocial/features/pro_timeline.js
index e1f3706f..39e0c4c0 100644
--- a/app/javascript/gabsocial/features/pro_timeline.js
+++ b/app/javascript/gabsocial/features/pro_timeline.js
@@ -3,7 +3,6 @@ import PropTypes from 'prop-types'
import { connect } from 'react-redux'
import { defineMessages, injectIntl } from 'react-intl'
import { expandProTimeline } from '../actions/timelines'
-import { connectProStream } from '../actions/streaming'
import StatusList from '../components/status_list'
class ProTimeline extends React.PureComponent {
@@ -16,15 +15,6 @@ class ProTimeline extends React.PureComponent {
const { dispatch } = this.props
dispatch(expandProTimeline())
-
- this.disconnect = dispatch(connectProStream())
- }
-
- componentWillUnmount() {
- if (this.disconnect) {
- this.disconnect()
- this.disconnect = null
- }
}
handleLoadMore = (maxId) => {
diff --git a/app/javascript/gabsocial/features/search.js b/app/javascript/gabsocial/features/search.js
index bc0207fd..26f7d617 100644
--- a/app/javascript/gabsocial/features/search.js
+++ b/app/javascript/gabsocial/features/search.js
@@ -6,7 +6,6 @@ import ImmutablePureComponent from 'react-immutable-pure-component'
import { withRouter } from 'react-router-dom'
import { me } from '../initial_state'
import ResponsiveClassesComponent from '../features/ui/util/responsive_classes_component'
-import HashtagItem from '../components/hashtag_item'
import GroupListItem from '../components/group_list_item'
import Text from '../components/text'
import Account from '../components/account'
@@ -60,14 +59,13 @@ class Search extends ImmutablePureComponent {
const pathname = location.pathname || ''
const showPeople = pathname === '/search/people'
- const showHashtags = pathname === '/search/hashtags'
const showGroups = pathname === '/search/groups'
const showStatuses = pathname === '/search/statuses'
const showLinks = pathname === '/search/links'
- const isTop = !showPeople && !showHashtags && !showGroups && !showStatuses && !showLinks
+ const isTop = !showPeople && !showGroups && !showStatuses && !showLinks
const theLimit = 4
- let accounts, statuses, hashtags, groups, links
+ let accounts, statuses, groups, links
if (results.get('accounts') && results.get('accounts').size > 0 && (isTop || showPeople)) {
const size = isTop ? Math.min(results.get('accounts').size, theLimit) : results.get('accounts').size;
@@ -192,30 +190,7 @@ class Search extends ImmutablePureComponent {
)
}
- if (results.get('hashtags') && results.get('hashtags').size > 0 && me && (isTop || showHashtags)) {
- const size = isTop ? Math.min(results.get('hashtags').size, theLimit) : results.get('hashtags').size;
- const isMax = size === results.get('hashtags').size
-
- hashtags = (
-
+
+ You don’t have a message selected
+
+
+ Choose one from your existing messages, or start a new one.
+
+
+
+ }
+ {
+ selectedMessage &&
+
+
+ }
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
- Showing {size} of {results.get('hashtags').size} results
-
-
- {results.get('hashtags').slice(0, size).map(hashtag =>
+
+
+
+
+
+
+
+
+
+
+
+
+
+ { /*
+
+
+
+ {children}
+
+ lorem
ipsum
<br>'); - expect(output).toEqual('lorem\n\nipsum\n
'); - }); - }); -}); diff --git a/app/lib/activitypub/activity.rb b/app/lib/activitypub/activity.rb deleted file mode 100644 index f049fd63..00000000 --- a/app/lib/activitypub/activity.rb +++ /dev/null @@ -1,187 +0,0 @@ -# frozen_string_literal: true - -class ActivityPub::Activity - include JsonLdHelper - include Redisable - - SUPPORTED_TYPES = %w(Note Question).freeze - CONVERTED_TYPES = %w(Image Video Article Page).freeze - - def initialize(json, account, **options) - @json = json - @account = account - @object = @json['object'] - @options = options - end - - def perform - raise NotImplementedError - end - - class << self - def factory(json, account, **options) - @json = json - klass&.new(json, account, options) - end - - private - - def klass - case @json['type'] - when 'Create' - ActivityPub::Activity::Create - when 'Announce' - ActivityPub::Activity::Announce - when 'Delete' - ActivityPub::Activity::Delete - when 'Follow' - ActivityPub::Activity::Follow - when 'Like' - ActivityPub::Activity::Like - when 'Block' - ActivityPub::Activity::Block - when 'Update' - ActivityPub::Activity::Update - when 'Undo' - ActivityPub::Activity::Undo - when 'Accept' - ActivityPub::Activity::Accept - when 'Reject' - ActivityPub::Activity::Reject - when 'Flag' - ActivityPub::Activity::Flag - when 'Add' - ActivityPub::Activity::Add - when 'Remove' - ActivityPub::Activity::Remove - when 'Move' - ActivityPub::Activity::Move - end - end - end - - protected - - def status_from_uri(uri) - ActivityPub::TagManager.instance.uri_to_resource(uri, Status) - end - - def account_from_uri(uri) - ActivityPub::TagManager.instance.uri_to_resource(uri, Account) - end - - def object_uri - @object_uri ||= value_or_id(@object) - end - - def unsupported_object_type? - @object.is_a?(String) || !(supported_object_type? || converted_object_type?) - end - - def supported_object_type? - equals_or_includes_any?(@object['type'], SUPPORTED_TYPES) - end - - def converted_object_type? - equals_or_includes_any?(@object['type'], CONVERTED_TYPES) - end - - def distribute(status) - crawl_links(status) - - notify_about_reblog(status) if reblog_of_local_account?(status) - notify_about_mentions(status) - - # Only continue if the status is supposed to have arrived in real-time. - # Note that if @options[:override_timestamps] isn't set, the status - # may have a lower snowflake id than other existing statuses, potentially - # "hiding" it from paginated API calls - return unless @options[:override_timestamps] || status.within_realtime_window? - - distribute_to_followers(status) - end - - def reblog_of_local_account?(status) - status.reblog? && status.reblog.account.local? - end - - def notify_about_reblog(status) - NotifyService.new.call(status.reblog.account, status) - end - - def notify_about_mentions(status) - status.active_mentions.includes(:account).each do |mention| - next unless mention.account.local? && audience_includes?(mention.account) - NotifyService.new.call(mention.account, mention) - end - end - - def crawl_links(status) - return if status.spoiler_text? - - # Spread out crawling randomly to avoid DDoSing the link - LinkCrawlWorker.perform_in(rand(1..59).seconds, status.id) - end - - def distribute_to_followers(status) - ::DistributionWorker.perform_async(status.id) - end - - def delete_arrived_first?(uri) - redis.exists("delete_upon_arrival:#{@account.id}:#{uri}") - end - - def delete_later!(uri) - redis.setex("delete_upon_arrival:#{@account.id}:#{uri}", 6.hours.seconds, uri) - end - - def status_from_object - # If the status is already known, return it - status = status_from_uri(object_uri) - - return status unless status.nil? - - # If the reposted gab is embedded and it is a self-repost, handle it like a Create - unless unsupported_object_type? - actor_id = value_or_id(first_of_value(@object['attributedTo'])) || @account.uri - - if actor_id == @account.uri - return ActivityPub::Activity.factory({ 'type' => 'Create', 'actor' => actor_id, 'object' => @object }, @account).perform - end - end - - fetch_remote_original_status - end - - def fetch_remote_original_status - if object_uri.start_with?('http') - return if ActivityPub::TagManager.instance.local_uri?(object_uri) - ActivityPub::FetchRemoteStatusService.new.call(object_uri, id: true, on_behalf_of: @account.followers.local.first) - elsif @object['url'].present? - ::FetchRemoteStatusService.new.call(@object['url']) - end - end - - def lock_or_return(key, expire_after = 7.days.seconds) - yield if redis.set(key, true, nx: true, ex: expire_after) - ensure - redis.del(key) - end - - def fetch? - !@options[:delivery] - end - - def followed_by_local_accounts? - @account.passive_relationships.exists? - end - - def requested_through_relay? - @options[:relayed_through_account] && Relay.find_by(inbox_url: @options[:relayed_through_account].inbox_url)&.enabled? - end - - def reject_payload! - Rails.logger.info("Rejected #{@json['type']} activity #{@json['id']} from #{@account.uri}#{@options[:relayed_through_account] && "via #{@options[:relayed_through_account].uri}"}") - nil - end -end diff --git a/app/lib/activitypub/activity/accept.rb b/app/lib/activitypub/activity/accept.rb deleted file mode 100644 index 348ee0d1..00000000 --- a/app/lib/activitypub/activity/accept.rb +++ /dev/null @@ -1,39 +0,0 @@ -# frozen_string_literal: true - -class ActivityPub::Activity::Accept < ActivityPub::Activity - def perform - case @object['type'] - when 'Follow' - accept_follow - end - end - - private - - def accept_follow - return accept_follow_for_relay if relay_follow? - - target_account = account_from_uri(target_uri) - - return if target_account.nil? || !target_account.local? - - follow_request = FollowRequest.find_by(account: target_account, target_account: @account) - follow_request&.authorize! - end - - def accept_follow_for_relay - relay.update!(state: :accepted) - end - - def relay - @relay ||= Relay.find_by(follow_activity_id: object_uri) unless object_uri.nil? - end - - def relay_follow? - relay.present? - end - - def target_uri - @target_uri ||= value_or_id(@object['actor']) - end -end diff --git a/app/lib/activitypub/activity/add.rb b/app/lib/activitypub/activity/add.rb deleted file mode 100644 index 688ab00b..00000000 --- a/app/lib/activitypub/activity/add.rb +++ /dev/null @@ -1,14 +0,0 @@ -# frozen_string_literal: true - -class ActivityPub::Activity::Add < ActivityPub::Activity - def perform - return unless @json['target'].present? && value_or_id(@json['target']) == @account.featured_collection_url - - status = status_from_uri(object_uri) - status ||= fetch_remote_original_status - - return unless !status.nil? && status.account_id == @account.id && !@account.pinned?(status) - - StatusPin.create!(account: @account, status: status) - end -end diff --git a/app/lib/activitypub/activity/announce.rb b/app/lib/activitypub/activity/announce.rb deleted file mode 100644 index 1aa6ee9e..00000000 --- a/app/lib/activitypub/activity/announce.rb +++ /dev/null @@ -1,57 +0,0 @@ -# frozen_string_literal: true - -class ActivityPub::Activity::Announce < ActivityPub::Activity - def perform - return reject_payload! if delete_arrived_first?(@json['id']) || !related_to_local_activity? - - original_status = status_from_object - - return reject_payload! if original_status.nil? || !announceable?(original_status) - - status = Status.find_by(account: @account, reblog: original_status) - - return status unless status.nil? - - status = Status.create!( - account: @account, - reblog: original_status, - uri: @json['id'], - created_at: @json['published'], - override_timestamps: @options[:override_timestamps], - visibility: visibility_from_audience - ) - - distribute(status) - status - end - - private - - def visibility_from_audience - if equals_or_includes?(@json['to'], ActivityPub::TagManager::COLLECTIONS[:public]) - :public - elsif equals_or_includes?(@json['cc'], ActivityPub::TagManager::COLLECTIONS[:public]) - :unlisted - elsif equals_or_includes?(@json['to'], @account.followers_url) - :private - else - :direct - end - end - - def announceable?(status) - status.account_id == @account.id || status.public_visibility? || status.unlisted_visibility? - end - - def related_to_local_activity? - followed_by_local_accounts? || requested_through_relay? || reblog_of_local_status? - end - - def requested_through_relay? - super || Relay.find_by(inbox_url: @account.inbox_url)&.enabled? - end - - def reblog_of_local_status? - status_from_uri(object_uri)&.account&.local? - end -end diff --git a/app/lib/activitypub/activity/block.rb b/app/lib/activitypub/activity/block.rb deleted file mode 100644 index a17a2d50..00000000 --- a/app/lib/activitypub/activity/block.rb +++ /dev/null @@ -1,13 +0,0 @@ -# frozen_string_literal: true - -class ActivityPub::Activity::Block < ActivityPub::Activity - def perform - target_account = account_from_uri(object_uri) - - return if target_account.nil? || !target_account.local? || @account.blocking?(target_account) - - UnfollowService.new.call(target_account, @account) if target_account.following?(@account) - - @account.block!(target_account, uri: @json['id']) unless delete_arrived_first?(@json['id']) - end -end diff --git a/app/lib/activitypub/activity/create.rb b/app/lib/activitypub/activity/create.rb deleted file mode 100644 index eee57769..00000000 --- a/app/lib/activitypub/activity/create.rb +++ /dev/null @@ -1,417 +0,0 @@ -# frozen_string_literal: true - -class ActivityPub::Activity::Create < ActivityPub::Activity - def perform - return reject_payload! if unsupported_object_type? || invalid_origin?(@object['id']) || Tombstone.exists?(uri: @object['id']) || !related_to_local_activity? - - RedisLock.acquire(lock_options) do |lock| - if lock.acquired? - return if delete_arrived_first?(object_uri) || poll_vote? - - @status = find_existing_status - - if @status.nil? - process_status - elsif @options[:delivered_to_account_id].present? - postprocess_audience_and_deliver - end - else - raise GabSocial::RaceConditionError - end - end - - @status - end - - private - - def process_status - @tags = [] - @mentions = [] - @params = {} - - process_status_params - process_tags - process_audience - - ApplicationRecord.transaction do - @status = Status.create!(@params) - attach_tags(@status) - end - - resolve_thread(@status) - fetch_replies(@status) - distribute(@status) - forward_for_reply if @status.public_visibility? || @status.unlisted_visibility? - end - - def find_existing_status - status = status_from_uri(object_uri) - status ||= Status.find_by(uri: @object['atomUri']) if @object['atomUri'].present? - status - end - - def process_status_params - @params = begin - { - uri: @object['id'], - url: object_url || @object['id'], - account: @account, - text: text_from_content || '', - language: detected_language, - spoiler_text: converted_object_type? ? '' : (text_from_summary || ''), - created_at: @object['published'], - override_timestamps: @options[:override_timestamps], - reply: @object['inReplyTo'].present?, - sensitive: @object['sensitive'] || false, - visibility: visibility_from_audience, - thread: replied_to_status, - conversation: conversation_from_uri(@object['conversation']), - media_attachment_ids: process_attachments.take(4).map(&:id), - poll: process_poll, - } - end - end - - def process_audience - (as_array(@object['to']) + as_array(@object['cc'])).uniq.each do |audience| - next if audience == ActivityPub::TagManager::COLLECTIONS[:public] - - # Unlike with tags, there is no point in resolving accounts we don't already - # know here, because silent mentions would only be used for local access - # control anyway - account = account_from_uri(audience) - - next if account.nil? || @mentions.any? { |mention| mention.account_id == account.id } - - @mentions << Mention.new(account: account, silent: true) - - # If there is at least one silent mention, then the status can be considered - # as a limited-audience status, and not strictly a direct message, but only - # if we considered a direct message in the first place - next unless @params[:visibility] == :direct - - @params[:visibility] = :limited - end - - # If the payload was delivered to a specific inbox, the inbox owner must have - # access to it, unless they already have access to it anyway - return if @options[:delivered_to_account_id].nil? || @mentions.any? { |mention| mention.account_id == @options[:delivered_to_account_id] } - - @mentions << Mention.new(account_id: @options[:delivered_to_account_id], silent: true) - - return unless @params[:visibility] == :direct - - @params[:visibility] = :limited - end - - def postprocess_audience_and_deliver - return if @status.mentions.find_by(account_id: @options[:delivered_to_account_id]) - - delivered_to_account = Account.find(@options[:delivered_to_account_id]) - - @status.mentions.create(account: delivered_to_account, silent: true) - @status.update(visibility: :limited) if @status.direct_visibility? - - return unless delivered_to_account.following?(@account) - - FeedInsertWorker.perform_async(@status.id, delivered_to_account.id, :home) - end - - def attach_tags(status) - @tags.each do |tag| - status.tags << tag - TrendingTags.record_use!(tag, status.account, status.created_at) if status.public_visibility? - end - - @mentions.each do |mention| - mention.status = status - mention.save - end - end - - def process_tags - return if @object['tag'].nil? - - as_array(@object['tag']).each do |tag| - if equals_or_includes?(tag['type'], 'Hashtag') - process_hashtag tag - elsif equals_or_includes?(tag['type'], 'Mention') - process_mention tag - elsif equals_or_includes?(tag['type'], 'Emoji') - process_emoji tag - end - end - end - - def process_hashtag(tag) - return if tag['name'].blank? - - hashtag = tag['name'].gsub(/\A#/, '').mb_chars.downcase - hashtag = Tag.where(name: hashtag).first_or_create!(name: hashtag) - - return if @tags.include?(hashtag) - - @tags << hashtag - rescue ActiveRecord::RecordInvalid - nil - end - - def process_mention(tag) - return if tag['href'].blank? - - account = account_from_uri(tag['href']) - account = ::FetchRemoteAccountService.new.call(tag['href']) if account.nil? - - return if account.nil? - - @mentions << Mention.new(account: account, silent: false) - end - - def process_emoji(tag) - return if skip_download? - return if tag['name'].blank? || tag['icon'].blank? || tag['icon']['url'].blank? - - shortcode = tag['name'].delete(':') - image_url = tag['icon']['url'] - uri = tag['id'] - updated = tag['updated'] - emoji = CustomEmoji.find_by(shortcode: shortcode, domain: @account.domain) - - return unless emoji.nil? || image_url != emoji.image_remote_url || (updated && updated >= emoji.updated_at) - - emoji ||= CustomEmoji.new(domain: @account.domain, shortcode: shortcode, uri: uri) - emoji.image_remote_url = image_url - emoji.save - end - - def process_attachments - return [] if @object['attachment'].nil? - - media_attachments = [] - - as_array(@object['attachment']).each do |attachment| - next if attachment['url'].blank? - - href = Addressable::URI.parse(attachment['url']).normalize.to_s - media_attachment = MediaAttachment.create(account: @account, remote_url: href, description: attachment['name'].presence, focus: attachment['focalPoint'], blurhash: supported_blurhash?(attachment['blurhash']) ? attachment['blurhash'] : nil) - media_attachments << media_attachment - - next if unsupported_media_type?(attachment['mediaType']) || skip_download? - - media_attachment.file_remote_url = href - media_attachment.save - end - - media_attachments - rescue Addressable::URI::InvalidURIError => e - Rails.logger.debug e - - media_attachments - end - - def process_poll - return unless @object['type'] == 'Question' && (@object['anyOf'].is_a?(Array) || @object['oneOf'].is_a?(Array)) - - expires_at = begin - if @object['closed'].is_a?(String) - @object['closed'] - elsif !@object['closed'].nil? && !@object['closed'].is_a?(FalseClass) - Time.now.utc - else - @object['endTime'] - end - end - - if @object['anyOf'].is_a?(Array) - multiple = true - items = @object['anyOf'] - else - multiple = false - items = @object['oneOf'] - end - - @account.polls.new( - multiple: multiple, - expires_at: expires_at, - options: items.map { |item| item['name'].presence || item['content'] }.compact, - cached_tallies: items.map { |item| item.dig('replies', 'totalItems') || 0 } - ) - end - - def poll_vote? - return false if replied_to_status.nil? || replied_to_status.preloadable_poll.nil? || !replied_to_status.local? || !replied_to_status.preloadable_poll.options.include?(@object['name']) - - unless replied_to_status.preloadable_poll.expired? - replied_to_status.preloadable_poll.votes.create!(account: @account, choice: replied_to_status.preloadable_poll.options.index(@object['name']), uri: @object['id']) - ActivityPub::DistributePollUpdateWorker.perform_in(3.minutes, replied_to_status.id) unless replied_to_status.preloadable_poll.hide_totals? - end - - true - end - - def resolve_thread(status) - return unless status.reply? && status.thread.nil? && Request.valid_url?(in_reply_to_uri) - ThreadResolveWorker.perform_async(status.id, in_reply_to_uri) - end - - def fetch_replies(status) - collection = @object['replies'] - return if collection.nil? - replies = ActivityPub::FetchRepliesService.new.call(status, collection, false) - return unless replies.nil? - uri = value_or_id(collection) - ActivityPub::FetchRepliesWorker.perform_async(status.id, uri) unless uri.nil? - end - - def conversation_from_uri(uri) - return nil if uri.nil? - return Conversation.find_by(id: OStatus::TagManager.instance.unique_tag_to_local_id(uri, 'Conversation')) if OStatus::TagManager.instance.local_id?(uri) - begin - Conversation.find_or_create_by!(uri: uri) - rescue ActiveRecord::RecordInvalid, ActiveRecord::RecordNotUnique - retry - end - end - - def visibility_from_audience - if equals_or_includes?(@object['to'], ActivityPub::TagManager::COLLECTIONS[:public]) - :public - elsif equals_or_includes?(@object['cc'], ActivityPub::TagManager::COLLECTIONS[:public]) - :unlisted - elsif equals_or_includes?(@object['to'], @account.followers_url) - :private - else - :direct - end - end - - def audience_includes?(account) - uri = ActivityPub::TagManager.instance.uri_for(account) - equals_or_includes?(@object['to'], uri) || equals_or_includes?(@object['cc'], uri) - end - - def replied_to_status - return @replied_to_status if defined?(@replied_to_status) - - if in_reply_to_uri.blank? - @replied_to_status = nil - else - @replied_to_status = status_from_uri(in_reply_to_uri) - @replied_to_status ||= status_from_uri(@object['inReplyToAtomUri']) if @object['inReplyToAtomUri'].present? - @replied_to_status - end - end - - def in_reply_to_uri - value_or_id(@object['inReplyTo']) - end - - def text_from_content - return Formatter.instance.linkify([[text_from_name, text_from_summary.presence].compact.join("\n\n"), object_url || @object['id']].join(' ')) if converted_object_type? - - if @object['content'].present? - @object['content'] - elsif content_language_map? - @object['contentMap'].values.first - end - end - - def text_from_summary - if @object['summary'].present? - @object['summary'] - elsif summary_language_map? - @object['summaryMap'].values.first - end - end - - def text_from_name - if @object['name'].present? - @object['name'] - elsif name_language_map? - @object['nameMap'].values.first - end - end - - def detected_language - if content_language_map? - @object['contentMap'].keys.first - elsif name_language_map? - @object['nameMap'].keys.first - elsif summary_language_map? - @object['summaryMap'].keys.first - elsif supported_object_type? - LanguageDetector.instance.detect(text_from_content, @account) - end - end - - def object_url - return if @object['url'].blank? - - url_candidate = url_to_href(@object['url'], 'text/html') - - if invalid_origin?(url_candidate) - nil - else - url_candidate - end - end - - def summary_language_map? - @object['summaryMap'].is_a?(Hash) && !@object['summaryMap'].empty? - end - - def content_language_map? - @object['contentMap'].is_a?(Hash) && !@object['contentMap'].empty? - end - - def name_language_map? - @object['nameMap'].is_a?(Hash) && !@object['nameMap'].empty? - end - - def unsupported_media_type?(mime_type) - mime_type.present? && !(MediaAttachment::IMAGE_MIME_TYPES + MediaAttachment::VIDEO_MIME_TYPES).include?(mime_type) - end - - def supported_blurhash?(blurhash) - components = blurhash.blank? ? nil : Blurhash.components(blurhash) - components.present? && components.none? { |comp| comp > 5 } - end - - def skip_download? - return @skip_download if defined?(@skip_download) - @skip_download ||= DomainBlock.find_by(domain: @account.domain)&.reject_media? - end - - def reply_to_local? - !replied_to_status.nil? && replied_to_status.account.local? - end - - def related_to_local_activity? - fetch? || followed_by_local_accounts? || requested_through_relay? || - responds_to_followed_account? || addresses_local_accounts? - end - - def responds_to_followed_account? - !replied_to_status.nil? && (replied_to_status.account.local? || replied_to_status.account.passive_relationships.exists?) - end - - def addresses_local_accounts? - return true if @options[:delivered_to_account_id] - - local_usernames = (as_array(@object['to']) + as_array(@object['cc'])).uniq.select { |uri| ActivityPub::TagManager.instance.local_uri?(uri) }.map { |uri| ActivityPub::TagManager.instance.uri_to_local_id(uri, :username) } - - return false if local_usernames.empty? - - Account.local.where(username: local_usernames).exists? - end - - def forward_for_reply - return unless @json['signature'].present? && reply_to_local? - ActivityPub::RawDistributionWorker.perform_async(Oj.dump(@json), replied_to_status.account_id, [@account.preferred_inbox_url]) - end - - def lock_options - { redis: Redis.current, key: "create:#{@object['id']}" } - end -end diff --git a/app/lib/activitypub/activity/delete.rb b/app/lib/activitypub/activity/delete.rb deleted file mode 100644 index 4236af07..00000000 --- a/app/lib/activitypub/activity/delete.rb +++ /dev/null @@ -1,78 +0,0 @@ -# frozen_string_literal: true - -class ActivityPub::Activity::Delete < ActivityPub::Activity - def perform - if @account.uri == object_uri - delete_person - else - delete_note - end - end - - private - - def delete_person - lock_or_return("delete_in_progress:#{@account.id}") do - SuspendAccountService.new.call(@account) - @account.destroy! - end - end - - def delete_note - return if object_uri.nil? - - unless invalid_origin?(object_uri) - RedisLock.acquire(lock_options) { |_lock| delete_later!(object_uri) } - Tombstone.find_or_create_by(uri: object_uri, account: @account) - end - - @status = Status.find_by(uri: object_uri, account: @account) - @status ||= Status.find_by(uri: @object['atomUri'], account: @account) if @object.is_a?(Hash) && @object['atomUri'].present? - - return if @status.nil? - - if @status.public_visibility? || @status.unlisted_visibility? - forward_for_reply - forward_for_reblogs - end - - delete_now! - end - - def forward_for_reblogs - return if @json['signature'].blank? - - rebloggers_ids = @status.reblogs.includes(:account).references(:account).merge(Account.local).pluck(:account_id) - inboxes = Account.where(id: ::Follow.where(target_account_id: rebloggers_ids).select(:account_id)).inboxes - [@account.preferred_inbox_url] - - ActivityPub::DeliveryWorker.push_bulk(inboxes) do |inbox_url| - [payload, rebloggers_ids.first, inbox_url] - end - end - - def replied_to_status - return @replied_to_status if defined?(@replied_to_status) - @replied_to_status = @status.thread - end - - def reply_to_local? - !replied_to_status.nil? && replied_to_status.account.local? - end - - def forward_for_reply - return unless @json['signature'].present? && reply_to_local? - ActivityPub::RawDistributionWorker.perform_async(Oj.dump(@json), replied_to_status.account_id, [@account.preferred_inbox_url]) - end - - def delete_now! - RemoveStatusService.new.call(@status) - end - - def payload - @payload ||= Oj.dump(@json) - end - - def lock_options - { redis: Redis.current, key: "create:#{object_uri}" } - end -end diff --git a/app/lib/activitypub/activity/flag.rb b/app/lib/activitypub/activity/flag.rb deleted file mode 100644 index f73b9305..00000000 --- a/app/lib/activitypub/activity/flag.rb +++ /dev/null @@ -1,36 +0,0 @@ -# frozen_string_literal: true - -class ActivityPub::Activity::Flag < ActivityPub::Activity - def perform - return if skip_reports? - - target_accounts = object_uris.map { |uri| account_from_uri(uri) }.compact.select(&:local?) - target_statuses_by_account = object_uris.map { |uri| status_from_uri(uri) }.compact.select(&:local?).group_by(&:account_id) - - target_accounts.each do |target_account| - target_statuses = target_statuses_by_account[target_account.id] - - ReportService.new.call( - @account, - target_account, - status_ids: target_statuses.nil? ? [] : target_statuses.map(&:id), - comment: @json['content'] || '', - uri: report_uri - ) - end - end - - private - - def skip_reports? - DomainBlock.find_by(domain: @account.domain)&.reject_reports? - end - - def object_uris - @object_uris ||= Array(@object.is_a?(Array) ? @object.map { |item| value_or_id(item) } : value_or_id(@object)) - end - - def report_uri - @json['id'] unless @json['id'].nil? || invalid_origin?(@json['id']) - end -end diff --git a/app/lib/activitypub/activity/follow.rb b/app/lib/activitypub/activity/follow.rb deleted file mode 100644 index 1e805c0d..00000000 --- a/app/lib/activitypub/activity/follow.rb +++ /dev/null @@ -1,34 +0,0 @@ -# frozen_string_literal: true - -class ActivityPub::Activity::Follow < ActivityPub::Activity - def perform - target_account = account_from_uri(object_uri) - - return if target_account.nil? || !target_account.local? || delete_arrived_first?(@json['id']) || @account.requested?(target_account) - - if target_account.blocking?(@account) || target_account.domain_blocking?(@account.domain) || target_account.moved? - reject_follow_request!(target_account) - return - end - - # Fast-forward repeat follow requests - if @account.following?(target_account) - AuthorizeFollowService.new.call(@account, target_account, skip_follow_request: true, follow_request_uri: @json['id']) - return - end - - follow_request = FollowRequest.create!(account: @account, target_account: target_account, uri: @json['id']) - - if target_account.locked? - NotifyService.new.call(target_account, follow_request) - else - AuthorizeFollowService.new.call(@account, target_account) - NotifyService.new.call(target_account, ::Follow.find_by(account: @account, target_account: target_account)) - end - end - - def reject_follow_request!(target_account) - json = ActiveModelSerializers::SerializableResource.new(FollowRequest.new(account: @account, target_account: target_account, uri: @json['id']), serializer: ActivityPub::RejectFollowSerializer, adapter: ActivityPub::Adapter).to_json - ActivityPub::DeliveryWorker.perform_async(json, target_account.id, @account.inbox_url) - end -end diff --git a/app/lib/activitypub/activity/like.rb b/app/lib/activitypub/activity/like.rb deleted file mode 100644 index 674d5fe4..00000000 --- a/app/lib/activitypub/activity/like.rb +++ /dev/null @@ -1,12 +0,0 @@ -# frozen_string_literal: true - -class ActivityPub::Activity::Like < ActivityPub::Activity - def perform - original_status = status_from_uri(object_uri) - - return if original_status.nil? || !original_status.account.local? || delete_arrived_first?(@json['id']) || @account.favourited?(original_status) - - favourite = original_status.favourites.create!(account: @account) - NotifyService.new.call(original_status.account, favourite) - end -end diff --git a/app/lib/activitypub/activity/move.rb b/app/lib/activitypub/activity/move.rb deleted file mode 100644 index d7a5f595..00000000 --- a/app/lib/activitypub/activity/move.rb +++ /dev/null @@ -1,43 +0,0 @@ -# frozen_string_literal: true - -class ActivityPub::Activity::Move < ActivityPub::Activity - PROCESSING_COOLDOWN = 7.days.seconds - - def perform - return if origin_account.uri != object_uri || processed? - - mark_as_processing! - - target_account = ActivityPub::FetchRemoteAccountService.new.call(target_uri) - - return if target_account.nil? || !target_account.also_known_as.include?(origin_account.uri) - - # In case for some reason we didn't have a redirect for the profile already, set it - origin_account.update(moved_to_account: target_account) if origin_account.moved_to_account_id.nil? - - # Initiate a re-follow for each follower - origin_account.followers.local.select(:id).find_in_batches do |follower_accounts| - UnfollowFollowWorker.push_bulk(follower_accounts.map(&:id)) do |follower_account_id| - [follower_account_id, origin_account.id, target_account.id] - end - end - end - - private - - def origin_account - @account - end - - def target_uri - value_or_id(@json['target']) - end - - def processed? - redis.exists("move_in_progress:#{@account.id}") - end - - def mark_as_processing! - redis.setex("move_in_progress:#{@account.id}", PROCESSING_COOLDOWN, true) - end -end diff --git a/app/lib/activitypub/activity/reject.rb b/app/lib/activitypub/activity/reject.rb deleted file mode 100644 index dba21fb9..00000000 --- a/app/lib/activitypub/activity/reject.rb +++ /dev/null @@ -1,41 +0,0 @@ -# frozen_string_literal: true - -class ActivityPub::Activity::Reject < ActivityPub::Activity - def perform - case @object['type'] - when 'Follow' - reject_follow - end - end - - private - - def reject_follow - return reject_follow_for_relay if relay_follow? - - target_account = account_from_uri(target_uri) - - return if target_account.nil? || !target_account.local? - - follow_request = FollowRequest.find_by(account: target_account, target_account: @account) - follow_request&.reject! - - UnfollowService.new.call(target_account, @account) if target_account.following?(@account) - end - - def reject_follow_for_relay - relay.update!(state: :rejected) - end - - def relay - @relay ||= Relay.find_by(follow_activity_id: object_uri) unless object_uri.nil? - end - - def relay_follow? - relay.present? - end - - def target_uri - @target_uri ||= value_or_id(@object['actor']) - end -end diff --git a/app/lib/activitypub/activity/remove.rb b/app/lib/activitypub/activity/remove.rb deleted file mode 100644 index f523ead9..00000000 --- a/app/lib/activitypub/activity/remove.rb +++ /dev/null @@ -1,14 +0,0 @@ -# frozen_string_literal: true - -class ActivityPub::Activity::Remove < ActivityPub::Activity - def perform - return unless @json['target'].present? && value_or_id(@json['target']) == @account.featured_collection_url - - status = status_from_uri(object_uri) - - return unless !status.nil? && status.account_id == @account.id - - pin = StatusPin.find_by(account: @account, status: status) - pin&.destroy! - end -end diff --git a/app/lib/activitypub/activity/undo.rb b/app/lib/activitypub/activity/undo.rb deleted file mode 100644 index 599823c6..00000000 --- a/app/lib/activitypub/activity/undo.rb +++ /dev/null @@ -1,80 +0,0 @@ -# frozen_string_literal: true - -class ActivityPub::Activity::Undo < ActivityPub::Activity - def perform - case @object['type'] - when 'Announce' - undo_announce - when 'Accept' - undo_accept - when 'Follow' - undo_follow - when 'Like' - undo_like - when 'Block' - undo_block - end - end - - private - - def undo_announce - return if object_uri.nil? - - status = Status.find_by(uri: object_uri, account: @account) - status ||= Status.find_by(uri: @object['atomUri'], account: @account) if @object.is_a?(Hash) && @object['atomUri'].present? - - if status.nil? - delete_later!(object_uri) - else - RemoveStatusService.new.call(status) - end - end - - def undo_accept - ::Follow.find_by(target_account: @account, uri: target_uri)&.revoke_request! - end - - def undo_follow - target_account = account_from_uri(target_uri) - - return if target_account.nil? || !target_account.local? - - if @account.following?(target_account) - @account.unfollow!(target_account) - elsif @account.requested?(target_account) - FollowRequest.find_by(account: @account, target_account: target_account)&.destroy - else - delete_later!(object_uri) - end - end - - def undo_like - status = status_from_uri(target_uri) - - return if status.nil? || !status.account.local? - - if @account.favourited?(status) - favourite = status.favourites.where(account: @account).first - favourite&.destroy - else - delete_later!(object_uri) - end - end - - def undo_block - target_account = account_from_uri(target_uri) - - return if target_account.nil? || !target_account.local? - - if @account.blocking?(target_account) - UnblockService.new.call(@account, target_account) - else - delete_later!(object_uri) - end - end - - def target_uri - @target_uri ||= value_or_id(@object['object']) - end -end diff --git a/app/lib/activitypub/activity/update.rb b/app/lib/activitypub/activity/update.rb deleted file mode 100644 index 70035325..00000000 --- a/app/lib/activitypub/activity/update.rb +++ /dev/null @@ -1,30 +0,0 @@ -# frozen_string_literal: true - -class ActivityPub::Activity::Update < ActivityPub::Activity - SUPPORTED_TYPES = %w(Application Group Organization Person Service).freeze - - def perform - if equals_or_includes_any?(@object['type'], SUPPORTED_TYPES) - update_account - elsif equals_or_includes_any?(@object['type'], %w(Question)) - update_poll - end - end - - private - - def update_account - return if @account.uri != object_uri - - ActivityPub::ProcessAccountService.new.call(@account.username, @account.domain, @object, signed_with_known_key: true) - end - - def update_poll - return reject_payload! if invalid_origin?(@object['id']) - - status = Status.find_by(uri: object_uri, account_id: @account.id) - return if status.nil? || status.preloadable_poll.nil? - - ActivityPub::ProcessPollService.new.call(status.preloadable_poll, @object) - end -end diff --git a/app/lib/activitypub/adapter.rb b/app/lib/activitypub/adapter.rb deleted file mode 100644 index c259c96f..00000000 --- a/app/lib/activitypub/adapter.rb +++ /dev/null @@ -1,66 +0,0 @@ -# frozen_string_literal: true - -class ActivityPub::Adapter < ActiveModelSerializers::Adapter::Base - NAMED_CONTEXT_MAP = { - activitystreams: 'https://www.w3.org/ns/activitystreams', - security: 'https://w3id.org/security/v1', - }.freeze - - CONTEXT_EXTENSION_MAP = { - manually_approves_followers: { 'manuallyApprovesFollowers' => 'as:manuallyApprovesFollowers' }, - sensitive: { 'sensitive' => 'as:sensitive' }, - hashtag: { 'Hashtag' => 'as:Hashtag' }, - moved_to: { 'movedTo' => { '@id' => 'as:movedTo', '@type' => '@id' } }, - also_known_as: { 'alsoKnownAs' => { '@id' => 'as:alsoKnownAs', '@type' => '@id' } }, - emoji: { 'toot' => 'http://joinmastodon.org/ns#', 'Emoji' => 'toot:Emoji' }, - featured: { 'toot' => 'http://joinmastodon.org/ns#', 'featured' => { '@id' => 'toot:featured', '@type' => '@id' } }, - property_value: { 'schema' => 'http://schema.org#', 'PropertyValue' => 'schema:PropertyValue', 'value' => 'schema:value' }, - atom_uri: { 'ostatus' => 'http://ostatus.org#', 'atomUri' => 'ostatus:atomUri' }, - conversation: { 'ostatus' => 'http://ostatus.org#', 'inReplyToAtomUri' => 'ostatus:inReplyToAtomUri', 'conversation' => 'ostatus:conversation' }, - focal_point: { 'toot' => 'http://joinmastodon.org/ns#', 'focalPoint' => { '@container' => '@list', '@id' => 'toot:focalPoint' } }, - identity_proof: { 'toot' => 'http://joinmastodon.org/ns#', 'IdentityProof' => 'toot:IdentityProof' }, - blurhash: { 'toot' => 'http://joinmastodon.org/ns#', 'blurhash' => 'toot:blurhash' }, - }.freeze - - def self.default_key_transform - :camel_lower - end - - def self.transform_key_casing!(value, _options) - ActivityPub::CaseTransform.camel_lower(value) - end - - def serializable_hash(options = nil) - options = serialization_options(options) - serialized_hash = serializer.serializable_hash(options) - serialized_hash = self.class.transform_key_casing!(serialized_hash, instance_options) - - { '@context' => serialized_context }.merge(serialized_hash) - end - - private - - def serialized_context - context_array = [] - - serializer_options = serializer.send(:instance_options) || {} - named_contexts = [:activitystreams] + serializer._named_contexts.keys + serializer_options.fetch(:named_contexts, {}).keys - context_extensions = serializer._context_extensions.keys + serializer_options.fetch(:context_extensions, {}).keys - - named_contexts.each do |key| - context_array << NAMED_CONTEXT_MAP[key] - end - - extensions = context_extensions.each_with_object({}) do |key, h| - h.merge!(CONTEXT_EXTENSION_MAP[key]) - end - - context_array << extensions unless extensions.empty? - - if context_array.size == 1 - context_array.first - else - context_array - end - end -end diff --git a/app/lib/activitypub/case_transform.rb b/app/lib/activitypub/case_transform.rb deleted file mode 100644 index 7f716f86..00000000 --- a/app/lib/activitypub/case_transform.rb +++ /dev/null @@ -1,24 +0,0 @@ -# frozen_string_literal: true - -module ActivityPub::CaseTransform - class << self - def camel_lower_cache - @camel_lower_cache ||= {} - end - - def camel_lower(value) - case value - when Array then value.map { |item| camel_lower(item) } - when Hash then value.deep_transform_keys! { |key| camel_lower(key) } - when Symbol then camel_lower(value.to_s).to_sym - when String - camel_lower_cache[value] ||= if value.start_with?('_:') - '_:' + value.gsub(/\A_:/, '').underscore.camelize(:lower) - else - value.underscore.camelize(:lower) - end - else value - end - end - end -end diff --git a/app/lib/activitypub/linked_data_signature.rb b/app/lib/activitypub/linked_data_signature.rb deleted file mode 100644 index f52a8f40..00000000 --- a/app/lib/activitypub/linked_data_signature.rb +++ /dev/null @@ -1,57 +0,0 @@ -# frozen_string_literal: true - -class ActivityPub::LinkedDataSignature - include JsonLdHelper - - CONTEXT = 'https://w3id.org/identity/v1' - - def initialize(json) - @json = json.with_indifferent_access - end - - def verify_account! - return unless @json['signature'].is_a?(Hash) - - type = @json['signature']['type'] - creator_uri = @json['signature']['creator'] - signature = @json['signature']['signatureValue'] - - return unless type == 'RsaSignature2017' - - creator = ActivityPub::TagManager.instance.uri_to_resource(creator_uri, Account) - creator ||= ActivityPub::FetchRemoteKeyService.new.call(creator_uri, id: false) - - return if creator.nil? - - options_hash = hash(@json['signature'].without('type', 'id', 'signatureValue').merge('@context' => CONTEXT)) - document_hash = hash(@json.without('signature')) - to_be_verified = options_hash + document_hash - - if creator.keypair.public_key.verify(OpenSSL::Digest::SHA256.new, Base64.decode64(signature), to_be_verified) - creator - end - end - - def sign!(creator, sign_with: nil) - options = { - 'type' => 'RsaSignature2017', - 'creator' => [ActivityPub::TagManager.instance.uri_for(creator), '#main-key'].join, - 'created' => Time.now.utc.iso8601, - } - - options_hash = hash(options.without('type', 'id', 'signatureValue').merge('@context' => CONTEXT)) - document_hash = hash(@json.without('signature')) - to_be_signed = options_hash + document_hash - keypair = sign_with.present? ? OpenSSL::PKey::RSA.new(sign_with) : creator.keypair - - signature = Base64.strict_encode64(keypair.sign(OpenSSL::Digest::SHA256.new, to_be_signed)) - - @json.merge('signature' => options.merge('signatureValue' => signature)) - end - - private - - def hash(obj) - Digest::SHA256.hexdigest(canonicalize(obj)) - end -end diff --git a/app/lib/activitypub/serializer.rb b/app/lib/activitypub/serializer.rb deleted file mode 100644 index 07bd8c49..00000000 --- a/app/lib/activitypub/serializer.rb +++ /dev/null @@ -1,30 +0,0 @@ -# frozen_string_literal: true - -class ActivityPub::Serializer < ActiveModel::Serializer - with_options instance_writer: false, instance_reader: true do |serializer| - serializer.class_attribute :_named_contexts - serializer.class_attribute :_context_extensions - - self._named_contexts ||= {} - self._context_extensions ||= {} - end - - def self.inherited(base) - super - - base._named_contexts = _named_contexts.dup - base._context_extensions = _context_extensions.dup - end - - def self.context(*named_contexts) - named_contexts.each do |context| - _named_contexts[context] = true - end - end - - def self.context_extensions(*extension_names) - extension_names.each do |extension_name| - _context_extensions[extension_name] = true - end - end -end diff --git a/app/lib/activitypub/tag_manager.rb b/app/lib/activitypub/tag_manager.rb deleted file mode 100644 index 59529134..00000000 --- a/app/lib/activitypub/tag_manager.rb +++ /dev/null @@ -1,143 +0,0 @@ -# frozen_string_literal: true - -require 'singleton' - -class ActivityPub::TagManager - include Singleton - include RoutingHelper - - CONTEXT = 'https://www.w3.org/ns/activitystreams' - - COLLECTIONS = { - public: 'https://www.w3.org/ns/activitystreams#Public', - }.freeze - - def url_for(target) - return target.url if target.respond_to?(:local?) && !target.local? - - case target.object_type - when :person - short_account_url(target) - when :note, :comment, :activity - return activity_account_status_url(target.account, target) if target.reblog? - short_account_status_url(target.account, target) - end - end - - def uri_for(target) - return target.uri if target.respond_to?(:local?) && !target.local? - - case target.object_type - when :person - account_url(target) - when :note, :comment, :activity - return activity_account_status_url(target.account, target) if target.reblog? - account_status_url(target.account, target) - when :emoji - emoji_url(target) - end - end - - def generate_uri_for(_target) - URI.join(root_url, 'payloads', SecureRandom.uuid) - end - - def activity_uri_for(target) - raise ArgumentError, 'target must be a local activity' unless %i(note comment activity).include?(target.object_type) && target.local? - - activity_account_status_url(target.account, target) - end - - def replies_uri_for(target, page_params = nil) - raise ArgumentError, 'target must be a local activity' unless %i(note comment activity).include?(target.object_type) && target.local? - - replies_account_status_url(target.account, target, page_params) - end - - # Primary audience of a status - # Public statuses go out to primarily the public collection - # Unlisted and private statuses go out primarily to the followers collection - # Others go out only to the people they mention - def to(status) - case status.visibility - when 'public' - [COLLECTIONS[:public]] - when 'unlisted', 'private' - [account_followers_url(status.account)] - when 'direct', 'limited' - if status.account.silenced? - # Only notify followers if the account is locally silenced - account_ids = status.active_mentions.pluck(:account_id) - to = status.account.followers.where(id: account_ids).map { |account| uri_for(account) } - to.concat(FollowRequest.where(target_account_id: status.account_id, account_id: account_ids).map { |request| uri_for(request.account) }) - else - status.active_mentions.map { |mention| uri_for(mention.account) } - end - end - end - - # Secondary audience of a status - # Public statuses go out to followers as well - # Unlisted statuses go to the public as well - # Both of those and private statuses also go to the people mentioned in them - # Direct ones don't have a secondary audience - def cc(status) - cc = [] - - cc << uri_for(status.reblog.account) if status.reblog? - - case status.visibility - when 'public' - cc << account_followers_url(status.account) - when 'unlisted' - cc << COLLECTIONS[:public] - end - - unless status.direct_visibility? || status.limited_visibility? - if status.account.silenced? - # Only notify followers if the account is locally silenced - account_ids = status.active_mentions.pluck(:account_id) - cc.concat(status.account.followers.where(id: account_ids).map { |account| uri_for(account) }) - cc.concat(FollowRequest.where(target_account_id: status.account_id, account_id: account_ids).map { |request| uri_for(request.account) }) - else - cc.concat(status.active_mentions.map { |mention| uri_for(mention.account) }) - end - end - - cc - end - - def local_uri?(uri) - return false if uri.nil? - - uri = Addressable::URI.parse(uri) - host = uri.normalized_host - host = "#{host}:#{uri.port}" if uri.port - - !host.nil? && (::TagManager.instance.local_domain?(host) || ::TagManager.instance.web_domain?(host)) - end - - def uri_to_local_id(uri, param = :id) - path_params = Rails.application.routes.recognize_path(uri) - path_params[param] - end - - def uri_to_resource(uri, klass) - return if uri.nil? - - if local_uri?(uri) - case klass.name - when 'Account' - klass.find_local(uri_to_local_id(uri, :username)) - else - StatusFinder.new(uri).status - end - elsif OStatus::TagManager.instance.local_id?(uri) - klass.find_by(id: OStatus::TagManager.instance.unique_tag_to_local_id(uri, klass.to_s)) - else - klass.find_by(uri: uri.split('#').first) - end - rescue ActiveRecord::RecordNotFound - nil - end -end diff --git a/app/lib/delivery_failure_tracker.rb b/app/lib/delivery_failure_tracker.rb deleted file mode 100644 index 8d3be35d..00000000 --- a/app/lib/delivery_failure_tracker.rb +++ /dev/null @@ -1,56 +0,0 @@ -# frozen_string_literal: true - -class DeliveryFailureTracker - FAILURE_DAYS_THRESHOLD = 7 - - def initialize(inbox_url) - @inbox_url = inbox_url - end - - def track_failure! - Redis.current.sadd(exhausted_deliveries_key, today) - Redis.current.sadd('unavailable_inboxes', @inbox_url) if reached_failure_threshold? - end - - def track_success! - Redis.current.del(exhausted_deliveries_key) - Redis.current.srem('unavailable_inboxes', @inbox_url) - end - - def days - Redis.current.scard(exhausted_deliveries_key) || 0 - end - - class << self - def filter(arr) - arr.reject(&method(:unavailable?)) - end - - def unavailable?(url) - Redis.current.sismember('unavailable_inboxes', url) - end - - def available?(url) - !unavailable?(url) - end - - def track_inverse_success!(from_account) - new(from_account.inbox_url).track_success! if from_account.inbox_url.present? - new(from_account.shared_inbox_url).track_success! if from_account.shared_inbox_url.present? - end - end - - private - - def exhausted_deliveries_key - "exhausted_deliveries:#{@inbox_url}" - end - - def today - Time.now.utc.strftime('%Y%m%d') - end - - def reached_failure_threshold? - days >= FAILURE_DAYS_THRESHOLD - end -end diff --git a/app/lib/entity_cache.rb b/app/lib/entity_cache.rb index 8fff544a..d2a21630 100644 --- a/app/lib/entity_cache.rb +++ b/app/lib/entity_cache.rb @@ -8,7 +8,7 @@ class EntityCache MAX_EXPIRATION = 7.days.freeze def mention(username, domain) - Rails.cache.fetch(to_key(:mention, username, domain), expires_in: MAX_EXPIRATION) { Account.select(:username, :domain, :url).find_remote(username, domain) } + Rails.cache.fetch(to_key(:mention, username, domain), expires_in: MAX_EXPIRATION) { Account.select(:username, :domain, :url).find_local(username) } end def emoji(shortcodes, domain) diff --git a/app/lib/feed_manager.rb b/app/lib/feed_manager.rb index 0791251a..43348c91 100644 --- a/app/lib/feed_manager.rb +++ b/app/lib/feed_manager.rb @@ -6,7 +6,7 @@ class FeedManager include Singleton include Redisable - MAX_ITEMS = 400 + MAX_ITEMS = 150 # Must be <= MAX_ITEMS or the tracking sets will grow forever REBLOG_FALLOFF = 40 @@ -40,18 +40,6 @@ class FeedManager true end - def push_to_list(list, status) - if status.reply? && status.in_reply_to_account_id != status.account_id - should_filter = status.in_reply_to_account_id != list.account_id - should_filter &&= !ListAccount.where(list_id: list.id, account_id: status.in_reply_to_account_id).exists? - return false if should_filter - end - return false unless add_to_feed(:list, list.id, status, list.account.user&.aggregates_reblogs?) - trim(:list, list.id) - PushUpdateWorker.perform_async(list.account_id, status.id, "timeline:list:#{list.id}") if push_update_required?("timeline:list:#{list.id}") - true - end - def unpush_from_list(list, status) return false unless remove_from_feed(:list, list.id, status) redis.publish("timeline:list:#{list.id}", Oj.dump(event: :delete, payload: status.id.to_s)) @@ -93,7 +81,7 @@ class FeedManager end query.each do |status| - next if status.direct_visibility? || status.limited_visibility? || filter?(:home, status, into_account) + next if status.limited_visibility? || filter?(:home, status, into_account) add_to_feed(:home, into_account.id, status, into_account.user&.aggregates_reblogs?) end @@ -173,9 +161,7 @@ class FeedManager should_filter &&= status.account_id != status.in_reply_to_account_id # and it's not a self-reply return should_filter elsif status.reblog? # Filter out a reblog - should_filter = Follow.where(account_id: receiver_id, target_account_id: status.account_id, show_reblogs: false).exists? # if the reblogger's reblogs are suppressed should_filter ||= Block.where(account_id: status.reblog.account_id, target_account_id: receiver_id).exists? # or if the author of the reblogged status is blocking me - should_filter ||= AccountDomainBlock.where(account_id: receiver_id, domain: status.reblog.account.domain).exists? # or the author's domain is blocked return should_filter end diff --git a/app/lib/formatter.rb b/app/lib/formatter.rb index 8dcd82d0..cc178f88 100644 --- a/app/lib/formatter.rb +++ b/app/lib/formatter.rb @@ -457,12 +457,12 @@ class Formatter "#{encode(prefix)}#{encode(text)}#{encode(suffix)}" + (cutoff ? "" : "") end - def hashtag_html(tag) - "##{encode(tag)}" + def hashtag_html(tagName) + "##{encode(tagName)}" end - def cashtag_html(tag) - "$#{encode(tag)}" + def cashtag_html(tagName) + "$#{encode(tagName)}" end def mention_html(account) diff --git a/app/lib/ostatus/activity/base.rb b/app/lib/ostatus/activity/base.rb deleted file mode 100644 index db70f199..00000000 --- a/app/lib/ostatus/activity/base.rb +++ /dev/null @@ -1,71 +0,0 @@ -# frozen_string_literal: true - -class OStatus::Activity::Base - include Redisable - - def initialize(xml, account = nil, **options) - @xml = xml - @account = account - @options = options - end - - def status? - [:activity, :note, :comment].include?(type) - end - - def verb - raw = @xml.at_xpath('./activity:verb', activity: OStatus::TagManager::AS_XMLNS).content - OStatus::TagManager::VERBS.key(raw) - rescue - :post - end - - def type - raw = @xml.at_xpath('./activity:object-type', activity: OStatus::TagManager::AS_XMLNS).content - OStatus::TagManager::TYPES.key(raw) - rescue - :activity - end - - def id - @xml.at_xpath('./xmlns:id', xmlns: OStatus::TagManager::XMLNS).content - end - - def url - link = @xml.xpath('./xmlns:link[@rel="alternate"]', xmlns: OStatus::TagManager::XMLNS).find { |link_candidate| link_candidate['type'] == 'text/html' } - link.nil? ? nil : link['href'] - end - - def activitypub_uri - link = @xml.xpath('./xmlns:link[@rel="alternate"]', xmlns: OStatus::TagManager::XMLNS).find { |link_candidate| ['application/activity+json', 'application/ld+json; profile="https://www.w3.org/ns/activitystreams"'].include?(link_candidate['type']) } - link.nil? ? nil : link['href'] - end - - def activitypub_uri? - activitypub_uri.present? - end - - private - - def find_status(uri) - if OStatus::TagManager.instance.local_id?(uri) - local_id = OStatus::TagManager.instance.unique_tag_to_local_id(uri, 'Status') - return Status.find_by(id: local_id) - elsif ActivityPub::TagManager.instance.local_uri?(uri) - local_id = ActivityPub::TagManager.instance.uri_to_local_id(uri) - return Status.find_by(id: local_id) - end - - Status.find_by(uri: uri) - end - - def find_activitypub_status(uri, href) - tag_matches = /tag:([^,:]+)[^:]*:objectId=([\d]+)/.match(uri) - href_matches = %r{/users/([^/]+)}.match(href) - - unless tag_matches.nil? || href_matches.nil? - uri = "https://#{tag_matches[1]}/users/#{href_matches[1]}/statuses/#{tag_matches[2]}" - Status.find_by(uri: uri) - end - end -end diff --git a/app/lib/ostatus/activity/creation.rb b/app/lib/ostatus/activity/creation.rb deleted file mode 100644 index 2b258afe..00000000 --- a/app/lib/ostatus/activity/creation.rb +++ /dev/null @@ -1,219 +0,0 @@ -# frozen_string_literal: true - -class OStatus::Activity::Creation < OStatus::Activity::Base - def perform - if redis.exists("delete_upon_arrival:#{@account.id}:#{id}") - Rails.logger.debug "Delete for status #{id} was queued, ignoring" - return [nil, false] - end - - return [nil, false] if @account.suspended? || invalid_origin? - - RedisLock.acquire(lock_options) do |lock| - if lock.acquired? - # Return early if status already exists in db - @status = find_status(id) - return [@status, false] unless @status.nil? - @status = process_status - else - raise GabSocial::RaceConditionError - end - end - - [@status, true] - end - - def process_status - Rails.logger.debug "Creating remote status #{id}" - cached_reblog = reblog - status = nil - - # Skip if the reblogged status is not public - return if cached_reblog && !(cached_reblog.public_visibility? || cached_reblog.unlisted_visibility?) - - media_attachments = save_media.take(4) - - ApplicationRecord.transaction do - status = Status.create!( - uri: id, - url: url, - account: @account, - reblog: cached_reblog, - text: content, - spoiler_text: content_warning, - created_at: published, - override_timestamps: @options[:override_timestamps], - reply: thread?, - language: content_language, - visibility: visibility_scope, - conversation: find_or_create_conversation, - thread: thread? ? find_status(thread.first) || find_activitypub_status(thread.first, thread.second) : nil, - media_attachment_ids: media_attachments.map(&:id), - sensitive: sensitive? - ) - - save_mentions(status) - save_hashtags(status) - save_emojis(status) - end - - if thread? && status.thread.nil? && Request.valid_url?(thread.second) - Rails.logger.debug "Trying to attach #{status.id} (#{id}) to #{thread.first}" - ThreadResolveWorker.perform_async(status.id, thread.second) - end - - Rails.logger.debug "Queuing remote status #{status.id} (#{id}) for distribution" - - LinkCrawlWorker.perform_async(status.id) unless status.spoiler_text? - - # Only continue if the status is supposed to have arrived in real-time. - # Note that if @options[:override_timestamps] isn't set, the status - # may have a lower snowflake id than other existing statuses, potentially - # "hiding" it from paginated API calls - return status unless @options[:override_timestamps] || status.within_realtime_window? - - DistributionWorker.perform_async(status.id) - - status - end - - def content - @xml.at_xpath('./xmlns:content', xmlns: OStatus::TagManager::XMLNS).content - end - - def content_language - @xml.at_xpath('./xmlns:content', xmlns: OStatus::TagManager::XMLNS)['xml:lang']&.presence || 'en' - end - - def content_warning - @xml.at_xpath('./xmlns:summary', xmlns: OStatus::TagManager::XMLNS)&.content || '' - end - - def visibility_scope - @xml.at_xpath('./mastodon:scope', mastodon: OStatus::TagManager::MTDN_XMLNS)&.content&.to_sym || :public - end - - def published - @xml.at_xpath('./xmlns:published', xmlns: OStatus::TagManager::XMLNS).content - end - - def thread? - !@xml.at_xpath('./thr:in-reply-to', thr: OStatus::TagManager::THR_XMLNS).nil? - end - - def thread - thr = @xml.at_xpath('./thr:in-reply-to', thr: OStatus::TagManager::THR_XMLNS) - [thr['ref'], thr['href']] - end - - private - - def sensitive? - # OStatus-specific convention (not standard) - @xml.xpath('./xmlns:category', xmlns: OStatus::TagManager::XMLNS).any? { |category| category['term'] == 'nsfw' } - end - - def find_or_create_conversation - uri = @xml.at_xpath('./ostatus:conversation', ostatus: OStatus::TagManager::OS_XMLNS)&.attribute('ref')&.content - return if uri.nil? - - if OStatus::TagManager.instance.local_id?(uri) - local_id = OStatus::TagManager.instance.unique_tag_to_local_id(uri, 'Conversation') - return Conversation.find_by(id: local_id) - end - - Conversation.find_by(uri: uri) || Conversation.create!(uri: uri) - end - - def save_mentions(parent) - processed_account_ids = [] - - @xml.xpath('./xmlns:link[@rel="mentioned"]', xmlns: OStatus::TagManager::XMLNS).each do |link| - next if [OStatus::TagManager::TYPES[:group], OStatus::TagManager::TYPES[:collection]].include? link['ostatus:object-type'] - - mentioned_account = account_from_href(link['href']) - - next if mentioned_account.nil? || processed_account_ids.include?(mentioned_account.id) - - mentioned_account.mentions.where(status: parent).first_or_create(status: parent) - - # So we can skip duplicate mentions - processed_account_ids << mentioned_account.id - end - end - - def save_hashtags(parent) - tags = @xml.xpath('./xmlns:category', xmlns: OStatus::TagManager::XMLNS).map { |category| category['term'] }.select(&:present?) - ProcessHashtagsService.new.call(parent, tags) - end - - def save_media - do_not_download = DomainBlock.find_by(domain: @account.domain)&.reject_media? - media_attachments = [] - - @xml.xpath('./xmlns:link[@rel="enclosure"]', xmlns: OStatus::TagManager::XMLNS).each do |link| - next unless link['href'] - - media = MediaAttachment.where(status: nil, remote_url: link['href']).first_or_initialize(account: @account, status: nil, remote_url: link['href']) - parsed_url = Addressable::URI.parse(link['href']).normalize - - next if !%w(http https).include?(parsed_url.scheme) || parsed_url.host.empty? - - media.save - media_attachments << media - - next if do_not_download - - begin - media.file_remote_url = link['href'] - media.save! - rescue ActiveRecord::RecordInvalid - next - end - end - - media_attachments - end - - def save_emojis(parent) - do_not_download = DomainBlock.find_by(domain: parent.account.domain)&.reject_media? - - return if do_not_download - - @xml.xpath('./xmlns:link[@rel="emoji"]', xmlns: OStatus::TagManager::XMLNS).each do |link| - next unless link['href'] && link['name'] - - shortcode = link['name'].delete(':') - emoji = CustomEmoji.find_by(shortcode: shortcode, domain: parent.account.domain) - - next unless emoji.nil? - - emoji = CustomEmoji.new(shortcode: shortcode, domain: parent.account.domain) - emoji.image_remote_url = link['href'] - emoji.save - end - end - - def account_from_href(href) - url = Addressable::URI.parse(href).normalize - - if TagManager.instance.web_domain?(url.host) - Account.find_local(url.path.gsub('/users/', '')) - else - Account.where(uri: href).or(Account.where(url: href)).first || FetchRemoteAccountService.new.call(href) - end - end - - def invalid_origin? - return false unless id.start_with?('http') # Legacy IDs cannot be checked - - needle = Addressable::URI.parse(id).normalized_host - - !(needle.casecmp(@account.domain).zero? || - needle.casecmp(Addressable::URI.parse(@account.remote_url.presence || @account.uri).normalized_host).zero?) - end - - def lock_options - { redis: Redis.current, key: "create:#{id}" } - end -end diff --git a/app/lib/ostatus/activity/deletion.rb b/app/lib/ostatus/activity/deletion.rb deleted file mode 100644 index c98f5ee0..00000000 --- a/app/lib/ostatus/activity/deletion.rb +++ /dev/null @@ -1,16 +0,0 @@ -# frozen_string_literal: true - -class OStatus::Activity::Deletion < OStatus::Activity::Base - def perform - Rails.logger.debug "Deleting remote status #{id}" - - status = Status.find_by(uri: id, account: @account) - status ||= Status.find_by(uri: activitypub_uri, account: @account) if activitypub_uri? - - if status.nil? - redis.setex("delete_upon_arrival:#{@account.id}:#{id}", 6 * 3_600, id) - else - RemoveStatusService.new.call(status) - end - end -end diff --git a/app/lib/ostatus/activity/general.rb b/app/lib/ostatus/activity/general.rb deleted file mode 100644 index 8a6aabc3..00000000 --- a/app/lib/ostatus/activity/general.rb +++ /dev/null @@ -1,20 +0,0 @@ -# frozen_string_literal: true - -class OStatus::Activity::General < OStatus::Activity::Base - def specialize - special_class&.new(@xml, @account, @options) - end - - private - - def special_class - case verb - when :post - OStatus::Activity::Post - when :share - OStatus::Activity::Share - when :delete - OStatus::Activity::Deletion - end - end -end diff --git a/app/lib/ostatus/activity/post.rb b/app/lib/ostatus/activity/post.rb deleted file mode 100644 index 755ed865..00000000 --- a/app/lib/ostatus/activity/post.rb +++ /dev/null @@ -1,23 +0,0 @@ -# frozen_string_literal: true - -class OStatus::Activity::Post < OStatus::Activity::Creation - def perform - status, just_created = super - - if just_created - status.mentions.includes(:account).each do |mention| - mentioned_account = mention.account - next unless mentioned_account.local? - NotifyService.new.call(mentioned_account, mention) - end - end - - status - end - - private - - def reblog - nil - end -end diff --git a/app/lib/ostatus/activity/remote.rb b/app/lib/ostatus/activity/remote.rb deleted file mode 100644 index 5b204b6d..00000000 --- a/app/lib/ostatus/activity/remote.rb +++ /dev/null @@ -1,11 +0,0 @@ -# frozen_string_literal: true - -class OStatus::Activity::Remote < OStatus::Activity::Base - def perform - if activitypub_uri? - find_status(activitypub_uri) || FetchRemoteStatusService.new.call(url) - else - find_status(id) || FetchRemoteStatusService.new.call(url) - end - end -end diff --git a/app/lib/ostatus/activity/share.rb b/app/lib/ostatus/activity/share.rb deleted file mode 100644 index 5ca60141..00000000 --- a/app/lib/ostatus/activity/share.rb +++ /dev/null @@ -1,26 +0,0 @@ -# frozen_string_literal: true - -class OStatus::Activity::Share < OStatus::Activity::Creation - def perform - return if reblog.nil? - - status, just_created = super - NotifyService.new.call(reblog.account, status) if reblog.account.local? && just_created - status - end - - def object - @xml.at_xpath('.//activity:object', activity: OStatus::TagManager::AS_XMLNS) - end - - private - - def reblog - return @reblog if defined? @reblog - - original_status = OStatus::Activity::Remote.new(object).perform - return if original_status.nil? - - @reblog = original_status.reblog? ? original_status.reblog : original_status - end -end diff --git a/app/lib/ostatus/atom_serializer.rb b/app/lib/ostatus/atom_serializer.rb deleted file mode 100644 index 962a6151..00000000 --- a/app/lib/ostatus/atom_serializer.rb +++ /dev/null @@ -1,377 +0,0 @@ -# frozen_string_literal: true - -class OStatus::AtomSerializer - include RoutingHelper - include ActionView::Helpers::SanitizeHelper - - class << self - def render(element) - document = Ox::Document.new(version: '1.0') - document << element - ('' + Ox.dump(element, effort: :tolerant)).force_encoding('UTF-8') - end - end - - def author(account) - author = Ox::Element.new('author') - - uri = OStatus::TagManager.instance.uri_for(account) - - append_element(author, 'id', uri) - append_element(author, 'activity:object-type', OStatus::TagManager::TYPES[:person]) - append_element(author, 'uri', uri) - append_element(author, 'name', account.username) - append_element(author, 'email', account.local? ? account.local_username_and_domain : account.acct) - append_element(author, 'summary', Formatter.instance.simplified_format(account).to_str, type: :html) if account.note? - append_element(author, 'link', nil, rel: :alternate, type: 'text/html', href: ::TagManager.instance.url_for(account)) - append_element(author, 'link', nil, rel: :avatar, type: account.avatar_content_type, 'media:width': 120, 'media:height': 120, href: full_asset_url(account.avatar.url(:original))) if account.avatar? - append_element(author, 'link', nil, rel: :header, type: account.header_content_type, 'media:width': 700, 'media:height': 335, href: full_asset_url(account.header.url(:original))) if account.header? - account.emojis.each do |emoji| - append_element(author, 'link', nil, rel: :emoji, href: full_asset_url(emoji.image.url), name: emoji.shortcode) - end - append_element(author, 'poco:preferredUsername', account.username) - append_element(author, 'poco:displayName', account.display_name) if account.display_name? - append_element(author, 'poco:note', account.local? ? account.note : strip_tags(account.note)) if account.note? - append_element(author, 'mastodon:scope', account.locked? ? :private : :public) - - author - end - - def feed(account, stream_entries) - feed = Ox::Element.new('feed') - - add_namespaces(feed) - - append_element(feed, 'id', account_url(account, format: 'atom')) - append_element(feed, 'title', account.display_name.presence || account.username) - append_element(feed, 'subtitle', account.note) - append_element(feed, 'updated', account.updated_at.iso8601) - append_element(feed, 'logo', full_asset_url(account.avatar.url(:original))) - - feed << author(account) - - append_element(feed, 'link', nil, rel: :alternate, type: 'text/html', href: ::TagManager.instance.url_for(account)) - append_element(feed, 'link', nil, rel: :self, type: 'application/atom+xml', href: account_url(account, format: 'atom')) - append_element(feed, 'link', nil, rel: :next, type: 'application/atom+xml', href: account_url(account, format: 'atom', max_id: stream_entries.last.id)) if stream_entries.size == 20 - append_element(feed, 'link', nil, rel: :hub, href: api_push_url) - - stream_entries.each do |stream_entry| - feed << entry(stream_entry) - end - - feed - end - - def entry(stream_entry, root = false) - entry = Ox::Element.new('entry') - - add_namespaces(entry) if root - - append_element(entry, 'id', OStatus::TagManager.instance.uri_for(stream_entry.status)) - append_element(entry, 'published', stream_entry.created_at.iso8601) - append_element(entry, 'updated', stream_entry.updated_at.iso8601) - append_element(entry, 'title', stream_entry&.status&.title || "#{stream_entry.account.acct} deleted status") - - entry << author(stream_entry.account) if root - - append_element(entry, 'activity:object-type', OStatus::TagManager::TYPES[stream_entry.object_type]) - append_element(entry, 'activity:verb', OStatus::TagManager::VERBS[stream_entry.verb]) - - entry << object(stream_entry.target) if stream_entry.targeted? - - if stream_entry.status.nil? - append_element(entry, 'content', 'Deleted status') - elsif stream_entry.status.destroyed? - append_element(entry, 'content', 'Deleted status') - append_element(entry, 'link', nil, rel: :alternate, type: 'application/activity+json', href: ActivityPub::TagManager.instance.uri_for(stream_entry.status)) if stream_entry.account.local? - else - serialize_status_attributes(entry, stream_entry.status) - end - - append_element(entry, 'link', nil, rel: :alternate, type: 'text/html', href: ::TagManager.instance.url_for(stream_entry.status)) - append_element(entry, 'link', nil, rel: :self, type: 'application/atom+xml', href: account_stream_entry_url(stream_entry.account, stream_entry, format: 'atom')) - append_element(entry, 'thr:in-reply-to', nil, ref: OStatus::TagManager.instance.uri_for(stream_entry.thread), href: ::TagManager.instance.url_for(stream_entry.thread)) if stream_entry.threaded? - append_element(entry, 'ostatus:conversation', nil, ref: conversation_uri(stream_entry.status.conversation)) unless stream_entry&.status&.conversation_id.nil? - - entry - end - - def object(status) - object = Ox::Element.new('activity:object') - - append_element(object, 'id', OStatus::TagManager.instance.uri_for(status)) - append_element(object, 'published', status.created_at.iso8601) - append_element(object, 'updated', status.updated_at.iso8601) - append_element(object, 'title', status.title) - - object << author(status.account) - - append_element(object, 'activity:object-type', OStatus::TagManager::TYPES[status.object_type]) - append_element(object, 'activity:verb', OStatus::TagManager::VERBS[status.verb]) - - serialize_status_attributes(object, status) - - append_element(object, 'link', nil, rel: :alternate, type: 'text/html', href: ::TagManager.instance.url_for(status)) - append_element(object, 'thr:in-reply-to', nil, ref: OStatus::TagManager.instance.uri_for(status.thread), href: ::TagManager.instance.url_for(status.thread)) unless status.thread.nil? - append_element(object, 'ostatus:conversation', nil, ref: conversation_uri(status.conversation)) unless status.conversation_id.nil? - - object - end - - def follow_salmon(follow) - entry = Ox::Element.new('entry') - add_namespaces(entry) - - description = "#{follow.account.acct} started following #{follow.target_account.acct}" - - append_element(entry, 'id', OStatus::TagManager.instance.unique_tag(follow.created_at, follow.id, 'Follow')) - append_element(entry, 'title', description) - append_element(entry, 'content', description, type: :html) - - entry << author(follow.account) - - append_element(entry, 'activity:object-type', OStatus::TagManager::TYPES[:activity]) - append_element(entry, 'activity:verb', OStatus::TagManager::VERBS[:follow]) - - object = author(follow.target_account) - object.value = 'activity:object' - - entry << object - entry - end - - def follow_request_salmon(follow_request) - entry = Ox::Element.new('entry') - add_namespaces(entry) - - append_element(entry, 'id', OStatus::TagManager.instance.unique_tag(follow_request.created_at, follow_request.id, 'FollowRequest')) - append_element(entry, 'title', "#{follow_request.account.acct} requested to follow #{follow_request.target_account.acct}") - - entry << author(follow_request.account) - - append_element(entry, 'activity:object-type', OStatus::TagManager::TYPES[:activity]) - append_element(entry, 'activity:verb', OStatus::TagManager::VERBS[:request_friend]) - - object = author(follow_request.target_account) - object.value = 'activity:object' - - entry << object - entry - end - - def authorize_follow_request_salmon(follow_request) - entry = Ox::Element.new('entry') - add_namespaces(entry) - - append_element(entry, 'id', OStatus::TagManager.instance.unique_tag(Time.now.utc, follow_request.id, 'FollowRequest')) - append_element(entry, 'title', "#{follow_request.target_account.acct} authorizes follow request by #{follow_request.account.acct}") - - entry << author(follow_request.target_account) - - append_element(entry, 'activity:object-type', OStatus::TagManager::TYPES[:activity]) - append_element(entry, 'activity:verb', OStatus::TagManager::VERBS[:authorize]) - - object = Ox::Element.new('activity:object') - object << author(follow_request.account) - - append_element(object, 'activity:object-type', OStatus::TagManager::TYPES[:activity]) - append_element(object, 'activity:verb', OStatus::TagManager::VERBS[:request_friend]) - - inner_object = author(follow_request.target_account) - inner_object.value = 'activity:object' - - object << inner_object - entry << object - entry - end - - def reject_follow_request_salmon(follow_request) - entry = Ox::Element.new('entry') - add_namespaces(entry) - - append_element(entry, 'id', OStatus::TagManager.instance.unique_tag(Time.now.utc, follow_request.id, 'FollowRequest')) - append_element(entry, 'title', "#{follow_request.target_account.acct} rejects follow request by #{follow_request.account.acct}") - - entry << author(follow_request.target_account) - - append_element(entry, 'activity:object-type', OStatus::TagManager::TYPES[:activity]) - append_element(entry, 'activity:verb', OStatus::TagManager::VERBS[:reject]) - - object = Ox::Element.new('activity:object') - object << author(follow_request.account) - - append_element(object, 'activity:object-type', OStatus::TagManager::TYPES[:activity]) - append_element(object, 'activity:verb', OStatus::TagManager::VERBS[:request_friend]) - - inner_object = author(follow_request.target_account) - inner_object.value = 'activity:object' - - object << inner_object - entry << object - entry - end - - def unfollow_salmon(follow) - entry = Ox::Element.new('entry') - add_namespaces(entry) - - description = "#{follow.account.acct} is no longer following #{follow.target_account.acct}" - - append_element(entry, 'id', OStatus::TagManager.instance.unique_tag(Time.now.utc, follow.id, 'Follow')) - append_element(entry, 'title', description) - append_element(entry, 'content', description, type: :html) - - entry << author(follow.account) - - append_element(entry, 'activity:object-type', OStatus::TagManager::TYPES[:activity]) - append_element(entry, 'activity:verb', OStatus::TagManager::VERBS[:unfollow]) - - object = author(follow.target_account) - object.value = 'activity:object' - - entry << object - entry - end - - def block_salmon(block) - entry = Ox::Element.new('entry') - add_namespaces(entry) - - description = "#{block.account.acct} no longer wishes to interact with #{block.target_account.acct}" - - append_element(entry, 'id', OStatus::TagManager.instance.unique_tag(Time.now.utc, block.id, 'Block')) - append_element(entry, 'title', description) - - entry << author(block.account) - - append_element(entry, 'activity:object-type', OStatus::TagManager::TYPES[:activity]) - append_element(entry, 'activity:verb', OStatus::TagManager::VERBS[:block]) - - object = author(block.target_account) - object.value = 'activity:object' - - entry << object - entry - end - - def unblock_salmon(block) - entry = Ox::Element.new('entry') - add_namespaces(entry) - - description = "#{block.account.acct} no longer blocks #{block.target_account.acct}" - - append_element(entry, 'id', OStatus::TagManager.instance.unique_tag(Time.now.utc, block.id, 'Block')) - append_element(entry, 'title', description) - - entry << author(block.account) - - append_element(entry, 'activity:object-type', OStatus::TagManager::TYPES[:activity]) - append_element(entry, 'activity:verb', OStatus::TagManager::VERBS[:unblock]) - - object = author(block.target_account) - object.value = 'activity:object' - - entry << object - entry - end - - def favourite_salmon(favourite) - entry = Ox::Element.new('entry') - add_namespaces(entry) - - description = "#{favourite.account.acct} favorited a status by #{favourite.status.account.acct}" - - append_element(entry, 'id', OStatus::TagManager.instance.unique_tag(favourite.created_at, favourite.id, 'Favourite')) - append_element(entry, 'title', description) - append_element(entry, 'content', description, type: :html) - - entry << author(favourite.account) - - append_element(entry, 'activity:object-type', OStatus::TagManager::TYPES[:activity]) - append_element(entry, 'activity:verb', OStatus::TagManager::VERBS[:favorite]) - - entry << object(favourite.status) - - append_element(entry, 'thr:in-reply-to', nil, ref: OStatus::TagManager.instance.uri_for(favourite.status), href: ::TagManager.instance.url_for(favourite.status)) - - entry - end - - def unfavourite_salmon(favourite) - entry = Ox::Element.new('entry') - add_namespaces(entry) - - description = "#{favourite.account.acct} no longer favorites a status by #{favourite.status.account.acct}" - - append_element(entry, 'id', OStatus::TagManager.instance.unique_tag(Time.now.utc, favourite.id, 'Favourite')) - append_element(entry, 'title', description) - append_element(entry, 'content', description, type: :html) - - entry << author(favourite.account) - - append_element(entry, 'activity:object-type', OStatus::TagManager::TYPES[:activity]) - append_element(entry, 'activity:verb', OStatus::TagManager::VERBS[:unfavorite]) - - entry << object(favourite.status) - - append_element(entry, 'thr:in-reply-to', nil, ref: OStatus::TagManager.instance.uri_for(favourite.status), href: ::TagManager.instance.url_for(favourite.status)) - - entry - end - - private - - def append_element(parent, name, content = nil, **attributes) - element = Ox::Element.new(name) - attributes.each { |k, v| element[k] = sanitize_str(v) } - element << sanitize_str(content) unless content.nil? - parent << element - end - - def sanitize_str(raw_str) - raw_str.to_s - end - - def conversation_uri(conversation) - return conversation.uri if conversation.uri? - OStatus::TagManager.instance.unique_tag(conversation.created_at, conversation.id, 'Conversation') - end - - def add_namespaces(parent) - parent['xmlns'] = OStatus::TagManager::XMLNS - parent['xmlns:thr'] = OStatus::TagManager::THR_XMLNS - parent['xmlns:activity'] = OStatus::TagManager::AS_XMLNS - parent['xmlns:poco'] = OStatus::TagManager::POCO_XMLNS - parent['xmlns:media'] = OStatus::TagManager::MEDIA_XMLNS - parent['xmlns:ostatus'] = OStatus::TagManager::OS_XMLNS - parent['xmlns:mastodon'] = OStatus::TagManager::MTDN_XMLNS - end - - def serialize_status_attributes(entry, status) - append_element(entry, 'link', nil, rel: :alternate, type: 'application/activity+json', href: ActivityPub::TagManager.instance.uri_for(status)) if status.account.local? - - append_element(entry, 'summary', status.spoiler_text, 'xml:lang': status.language) if status.spoiler_text? - append_element(entry, 'content', Formatter.instance.format(status, inline_poll_options: true).to_str || '.', type: 'html', 'xml:lang': status.language) - - status.active_mentions.sort_by(&:id).each do |mentioned| - append_element(entry, 'link', nil, rel: :mentioned, 'ostatus:object-type': OStatus::TagManager::TYPES[:person], href: OStatus::TagManager.instance.uri_for(mentioned.account)) - end - - append_element(entry, 'link', nil, rel: :mentioned, 'ostatus:object-type': OStatus::TagManager::TYPES[:collection], href: OStatus::TagManager::COLLECTIONS[:public]) if status.public_visibility? - - status.tags.each do |tag| - append_element(entry, 'category', nil, term: tag.name) - end - - status.media_attachments.each do |media| - append_element(entry, 'link', nil, rel: :enclosure, type: media.file_content_type, length: media.file_file_size, href: full_asset_url(media.file.url(:original, false))) - end - - append_element(entry, 'category', nil, term: 'nsfw') if status.sensitive? && status.media_attachments.any? - append_element(entry, 'mastodon:scope', status.visibility) - - status.emojis.each do |emoji| - append_element(entry, 'link', nil, rel: :emoji, href: full_asset_url(emoji.image.url), name: emoji.shortcode) - end - end -end diff --git a/app/lib/ostatus/tag_manager.rb b/app/lib/ostatus/tag_manager.rb deleted file mode 100644 index e04b4144..00000000 --- a/app/lib/ostatus/tag_manager.rb +++ /dev/null @@ -1,73 +0,0 @@ -# frozen_string_literal: true - -class OStatus::TagManager - include Singleton - include RoutingHelper - - VERBS = { - post: 'http://activitystrea.ms/schema/1.0/post', - share: 'http://activitystrea.ms/schema/1.0/share', - favorite: 'http://activitystrea.ms/schema/1.0/favorite', - unfavorite: 'http://activitystrea.ms/schema/1.0/unfavorite', - delete: 'http://activitystrea.ms/schema/1.0/delete', - follow: 'http://activitystrea.ms/schema/1.0/follow', - request_friend: 'http://activitystrea.ms/schema/1.0/request-friend', - authorize: 'http://activitystrea.ms/schema/1.0/authorize', - reject: 'http://activitystrea.ms/schema/1.0/reject', - unfollow: 'http://ostatus.org/schema/1.0/unfollow', - block: 'http://mastodon.social/schema/1.0/block', - unblock: 'http://mastodon.social/schema/1.0/unblock', - }.freeze - - TYPES = { - activity: 'http://activitystrea.ms/schema/1.0/activity', - note: 'http://activitystrea.ms/schema/1.0/note', - comment: 'http://activitystrea.ms/schema/1.0/comment', - person: 'http://activitystrea.ms/schema/1.0/person', - collection: 'http://activitystrea.ms/schema/1.0/collection', - group: 'http://activitystrea.ms/schema/1.0/group', - }.freeze - - COLLECTIONS = { - public: 'http://activityschema.org/collection/public', - }.freeze - - XMLNS = 'http://www.w3.org/2005/Atom' - MEDIA_XMLNS = 'http://purl.org/syndication/atommedia' - AS_XMLNS = 'http://activitystrea.ms/spec/1.0/' - THR_XMLNS = 'http://purl.org/syndication/thread/1.0' - POCO_XMLNS = 'http://portablecontacts.net/spec/1.0' - DFRN_XMLNS = 'http://purl.org/macgirvin/dfrn/1.0' - OS_XMLNS = 'http://ostatus.org/schema/1.0' - MTDN_XMLNS = 'http://mastodon.social/schema/1.0' - - def unique_tag(date, id, type) - "tag:#{Rails.configuration.x.local_domain},#{date.strftime('%Y-%m-%d')}:objectId=#{id}:objectType=#{type}" - end - - def unique_tag_to_local_id(tag, expected_type) - return nil unless local_id?(tag) - - if ActivityPub::TagManager.instance.local_uri?(tag) - ActivityPub::TagManager.instance.uri_to_local_id(tag) - else - matches = Regexp.new("objectId=([\\d]+):objectType=#{expected_type}").match(tag) - return matches[1] unless matches.nil? - end - end - - def local_id?(id) - id.start_with?("tag:#{Rails.configuration.x.local_domain}") || ActivityPub::TagManager.instance.local_uri?(id) - end - - def uri_for(target) - return target.uri if target.respond_to?(:local?) && !target.local? - - case target.object_type - when :person - account_url(target) - when :note, :comment, :activity - target.uri || unique_tag(target.created_at, target.id, 'Status') - end - end -end diff --git a/app/lib/proof_provider.rb b/app/lib/proof_provider.rb deleted file mode 100644 index 102c50f4..00000000 --- a/app/lib/proof_provider.rb +++ /dev/null @@ -1,12 +0,0 @@ -# frozen_string_literal: true - -module ProofProvider - SUPPORTED_PROVIDERS = %w(keybase).freeze - - def self.find(identifier, proof = nil) - case identifier - when 'keybase' - ProofProvider::Keybase.new(proof) - end - end -end diff --git a/app/lib/proof_provider/keybase.rb b/app/lib/proof_provider/keybase.rb deleted file mode 100644 index 8e51d714..00000000 --- a/app/lib/proof_provider/keybase.rb +++ /dev/null @@ -1,69 +0,0 @@ -# frozen_string_literal: true - -class ProofProvider::Keybase - BASE_URL = ENV.fetch('KEYBASE_BASE_URL', 'https://keybase.io') - DOMAIN = ENV.fetch('KEYBASE_DOMAIN', Rails.configuration.x.web_domain) - - class Error < StandardError; end - - class ExpectedProofLiveError < Error; end - - class UnexpectedResponseError < Error; end - - def initialize(proof = nil) - @proof = proof - end - - def serializer_class - ProofProvider::Keybase::Serializer - end - - def worker_class - ProofProvider::Keybase::Worker - end - - def validate! - unless @proof.token&.size == 66 - @proof.errors.add(:base, I18n.t('identity_proofs.errors.keybase.invalid_token')) - return - end - - # Do not perform synchronous validation for remote accounts - return if @proof.provider_username.blank? || !@proof.account.local? - - if verifier.valid? - @proof.verified = true - @proof.live = false - else - @proof.errors.add(:base, I18n.t('identity_proofs.errors.keybase.verification_failed', kb_username: @proof.provider_username)) - end - end - - def refresh! - worker_class.new.perform(@proof) - rescue ProofProvider::Keybase::Error - nil - end - - def on_success_path(user_agent = nil) - verifier.on_success_path(user_agent) - end - - def badge - @badge ||= ProofProvider::Keybase::Badge.new(@proof.account.username, @proof.provider_username, @proof.token, domain) - end - - def verifier - @verifier ||= ProofProvider::Keybase::Verifier.new(@proof.account.username, @proof.provider_username, @proof.token, domain) - end - - private - - def domain - if @proof.account.local? - DOMAIN - else - @proof.account.domain - end - end -end diff --git a/app/lib/proof_provider/keybase/badge.rb b/app/lib/proof_provider/keybase/badge.rb deleted file mode 100644 index f587b1cc..00000000 --- a/app/lib/proof_provider/keybase/badge.rb +++ /dev/null @@ -1,45 +0,0 @@ -# frozen_string_literal: true - -class ProofProvider::Keybase::Badge - include RoutingHelper - - def initialize(local_username, provider_username, token, domain) - @local_username = local_username - @provider_username = provider_username - @token = token - @domain = domain - end - - def proof_url - "#{ProofProvider::Keybase::BASE_URL}/#{@provider_username}/sigchain\##{@token}" - end - - def profile_url - "#{ProofProvider::Keybase::BASE_URL}/#{@provider_username}" - end - - def icon_url - "#{ProofProvider::Keybase::BASE_URL}/#{@provider_username}/proof_badge/#{@token}?username=#{@local_username}&domain=#{@domain}" - end - - def avatar_url - Rails.cache.fetch("proof_providers/keybase/#{@provider_username}/avatar_url", expires_in: 5.minutes) { remote_avatar_url } || default_avatar_url - end - - private - - def remote_avatar_url - request = Request.new(:get, "#{ProofProvider::Keybase::BASE_URL}/_/api/1.0/user/pic_url.json", params: { username: @provider_username }) - - request.perform do |res| - json = Oj.load(res.body_with_limit, mode: :strict) - json['pic_url'] if json.is_a?(Hash) - end - rescue Oj::ParseError, HTTP::Error, OpenSSL::SSL::SSLError - nil - end - - def default_avatar_url - asset_pack_path('media/images/proof_providers/keybase.png') - end -end diff --git a/app/lib/proof_provider/keybase/config_serializer.rb b/app/lib/proof_provider/keybase/config_serializer.rb deleted file mode 100644 index 7e90120f..00000000 --- a/app/lib/proof_provider/keybase/config_serializer.rb +++ /dev/null @@ -1,71 +0,0 @@ -# frozen_string_literal: true - -class ProofProvider::Keybase::ConfigSerializer < ActiveModel::Serializer - include RoutingHelper - include ActionView::Helpers::TextHelper - - attributes :version, :domain, :display_name, :username, - :brand_color, :logo, :description, :prefill_url, - :profile_url, :check_url, :check_path, :avatar_path, - :contact - - def version - 1 - end - - def domain - ProofProvider::Keybase::DOMAIN - end - - def display_name - Setting::SITE_TITLE - end - - def logo - { svg_black: full_asset_url(asset_pack_path('media/images/logo_transparent_black.svg')), svg_full: full_asset_url(asset_pack_path('media/images/logo.png')) } - end - - def brand_color - '#21D07B' - end - - def description - strip_tags(Setting.site_short_description.presence || I18n.t('about.about_gabsocial_html')) - end - - def username - { min: 1, max: 30, re: '[a-z0-9_]+([a-z0-9_.-]+[a-z0-9_]+)?' } - end - - def prefill_url - params = { - provider: 'keybase', - token: '%{sig_hash}', - provider_username: '%{kb_username}', - username: '%{username}', - user_agent: '%{kb_ua}', - } - - CGI.unescape(new_settings_identity_proof_url(params)) - end - - def profile_url - CGI.unescape(short_account_url('%{username}')) # rubocop:disable Style/FormatStringToken - end - - def check_url - CGI.unescape(api_proofs_url(username: '%{username}', provider: 'keybase')) - end - - def check_path - ['signatures'] - end - - def avatar_path - ['avatar'] - end - - def contact - [Setting.site_contact_email.presence || 'unknown'].compact - end -end diff --git a/app/lib/proof_provider/keybase/serializer.rb b/app/lib/proof_provider/keybase/serializer.rb deleted file mode 100644 index d2928360..00000000 --- a/app/lib/proof_provider/keybase/serializer.rb +++ /dev/null @@ -1,25 +0,0 @@ -# frozen_string_literal: true - -class ProofProvider::Keybase::Serializer < ActiveModel::Serializer - include RoutingHelper - - attribute :avatar - - has_many :identity_proofs, key: :signatures - - def avatar - full_asset_url(object.avatar_original_url) - end - - class AccountIdentityProofSerializer < ActiveModel::Serializer - attributes :sig_hash, :kb_username - - def sig_hash - object.token - end - - def kb_username - object.provider_username - end - end -end diff --git a/app/lib/proof_provider/keybase/verifier.rb b/app/lib/proof_provider/keybase/verifier.rb deleted file mode 100644 index af69b1bf..00000000 --- a/app/lib/proof_provider/keybase/verifier.rb +++ /dev/null @@ -1,59 +0,0 @@ -# frozen_string_literal: true - -class ProofProvider::Keybase::Verifier - def initialize(local_username, provider_username, token, domain) - @local_username = local_username - @provider_username = provider_username - @token = token - @domain = domain - end - - def valid? - request = Request.new(:get, "#{ProofProvider::Keybase::BASE_URL}/_/api/1.0/sig/proof_valid.json", params: query_params) - - request.perform do |res| - json = Oj.load(res.body_with_limit, mode: :strict) - - if json.is_a?(Hash) - json.fetch('proof_valid', false) - else - false - end - end - rescue Oj::ParseError, HTTP::Error, OpenSSL::SSL::SSLError - false - end - - def on_success_path(user_agent = nil) - url = Addressable::URI.parse("#{ProofProvider::Keybase::BASE_URL}/_/proof_creation_success") - url.query_values = query_params.merge(kb_ua: user_agent || 'unknown') - url.to_s - end - - def status - request = Request.new(:get, "#{ProofProvider::Keybase::BASE_URL}/_/api/1.0/sig/proof_live.json", params: query_params) - - request.perform do |res| - raise ProofProvider::Keybase::UnexpectedResponseError unless res.code == 200 - - json = Oj.load(res.body_with_limit, mode: :strict) - - raise ProofProvider::Keybase::UnexpectedResponseError unless json.is_a?(Hash) && json.key?('proof_valid') && json.key?('proof_live') - - json - end - rescue Oj::ParseError, HTTP::Error, OpenSSL::SSL::SSLError - raise ProofProvider::Keybase::UnexpectedResponseError - end - - private - - def query_params - { - domain: @domain, - kb_username: @provider_username, - username: @local_username, - sig_hash: @token, - } - end -end diff --git a/app/lib/proof_provider/keybase/worker.rb b/app/lib/proof_provider/keybase/worker.rb deleted file mode 100644 index df6f5876..00000000 --- a/app/lib/proof_provider/keybase/worker.rb +++ /dev/null @@ -1,32 +0,0 @@ -# frozen_string_literal: true - -class ProofProvider::Keybase::Worker - include Sidekiq::Worker - - sidekiq_options queue: 'pull', retry: 20, unique: :until_executed - - sidekiq_retry_in do |count, exception| - # Retry aggressively when the proof is valid but not live in Keybase. - # This is likely because Keybase just hasn't noticed the proof being - # served from here yet. - - if exception.class == ProofProvider::Keybase::ExpectedProofLiveError - case count - when 0..2 then 0.seconds - when 2..6 then 1.second - end - end - end - - def perform(proof_id) - proof = proof_id.is_a?(AccountIdentityProof) ? proof_id : AccountIdentityProof.find(proof_id) - status = proof.provider_instance.verifier.status - - # If Keybase thinks the proof is valid, and it exists here in Gab Social, - # then it should be live. Keybase just has to notice that it's here - # and then update its state. That might take a couple seconds. - raise ProofProvider::Keybase::ExpectedProofLiveError if status['proof_valid'] && !status['proof_live'] - - proof.update!(verified: status['proof_valid'], live: status['proof_live']) - end -end diff --git a/app/lib/request.rb b/app/lib/request.rb index bbae44ea..cd3f1420 100644 --- a/app/lib/request.rb +++ b/app/lib/request.rb @@ -108,12 +108,8 @@ class Request end def key_id - case @key_id_format - when :acct - @account.to_webfinger_s - when :uri - [ActivityPub::TagManager.instance.uri_for(@account), '#main-key'].join - end + # : todo : remove + nil end def timeout diff --git a/app/lib/rss_builder.rb b/app/lib/rss_builder.rb deleted file mode 100644 index 63ddba2e..00000000 --- a/app/lib/rss_builder.rb +++ /dev/null @@ -1,130 +0,0 @@ -# frozen_string_literal: true - -class RSSBuilder - class ItemBuilder - def initialize - @item = Ox::Element.new('item') - end - - def title(str) - @item << (Ox::Element.new('title') << str) - - self - end - - def link(str) - @item << Ox::Element.new('guid').tap do |guid| - guid['isPermalink'] = 'true' - guid << str - end - - @item << (Ox::Element.new('link') << str) - - self - end - - def pub_date(date) - @item << (Ox::Element.new('pubDate') << date.to_formatted_s(:rfc822)) - - self - end - - def description(str) - @item << (Ox::Element.new('description') << str) - - self - end - - def enclosure(url, type, size) - @item << Ox::Element.new('enclosure').tap do |enclosure| - enclosure['url'] = url - enclosure['length'] = size - enclosure['type'] = type - end - - self - end - - def to_element - @item - end - end - - def initialize - @document = Ox::Document.new(version: '1.0') - @channel = Ox::Element.new('channel') - - @document << (rss << @channel) - end - - def title(str) - @channel << (Ox::Element.new('title') << str) - - self - end - - def link(str) - @channel << (Ox::Element.new('link') << str) - - self - end - - def image(str) - @channel << Ox::Element.new('image').tap do |image| - image << (Ox::Element.new('url') << str) - image << (Ox::Element.new('title') << '') - image << (Ox::Element.new('link') << '') - end - - @channel << (Ox::Element.new('webfeeds:icon') << str) - - self - end - - def cover(str) - @channel << Ox::Element.new('webfeeds:cover').tap do |cover| - cover['image'] = str - end - - self - end - - def logo(str) - @channel << (Ox::Element.new('webfeeds:logo') << str) - - self - end - - def accent_color(str) - @channel << (Ox::Element.new('webfeeds:accentColor') << str) - - self - end - - def description(str) - @channel << (Ox::Element.new('description') << str) - - self - end - - def item - @channel << ItemBuilder.new.tap do |item| - yield item - end.to_element - - self - end - - def to_xml - ('' + Ox.dump(@document, effort: :tolerant)).force_encoding('UTF-8') - end - - private - - def rss - Ox::Element.new('rss').tap do |rss| - rss['version'] = '2.0' - rss['xmlns:webfeeds'] = 'http://webfeeds.org/rss/1.0' - end - end -end diff --git a/app/lib/sorting_query_builder.rb b/app/lib/sorting_query_builder.rb new file mode 100644 index 00000000..b9be19d1 --- /dev/null +++ b/app/lib/sorting_query_builder.rb @@ -0,0 +1,51 @@ +# frozen_string_literal: true + +class SortingQueryBuilder < BaseService + def call(sort_type, max_id = nil, group = nil) + min_likes = 20 + min_reblogs = 10 + min_replies = 2 + date_limit = 30.days.ago + + case sort_type + when 'hot' + date_limit = 8.hours.ago + when 'top_today' + date_limit = 24.hours.ago + when 'top_weekly' + date_limit = 7.days.ago + when 'top_monthly' + date_limit = 30.days.ago + when 'top_yearly' + date_limit = 1.year.ago + end + + top_order = 'status_stats.favourites_count DESC, status_stats.reblogs_count DESC, status_stats.replies_count DESC' + valid_sort_types = [ + 'hot', + 'newest', + 'recent', + 'top_today', + 'top_weekly', + 'top_monthly', + 'top_yearly', + 'top_all_time', + ] + + query = Status.unscoped.without_replies + query = query.joins(:status_stat).order(top_order) unless ['newest'].include? sort_type + query = query.where('statuses.created_at > ?', date_limit) + query = query.where(group: @group) unless group.nil? + query = query.where('statuses.id > ? AND statuses.id <> ?', max_id, max_id) unless max_id.nil? || max_id.empty? + query = query.limit(20) + + # SELECT "statuses".* + # FROM "statuses" + # INNER JOIN "status_stats" ON "status_stats"."status_id" = "statuses"."id" + # WHERE (statuses.reply IS FALSE) AND (statuses.created_at > '2020-11-02 22:01:36.197805') + # ORDER BY "statuses"."created_at" DESC, status_stats.favourites_count DESC, status_stats.reblogs_count DESC, status_stats.replies_count DESC LIMIT $1 + + query + end + +end diff --git a/app/lib/status_filter.rb b/app/lib/status_filter.rb index b6c80b80..a0f30b64 100644 --- a/app/lib/status_filter.rb +++ b/app/lib/status_filter.rb @@ -28,10 +28,6 @@ class StatusFilter @preloaded_relations[:blocking] ? @preloaded_relations[:blocking][status.account_id] : account.blocking?(status.account_id) end - def blocking_domain? - @preloaded_relations[:domain_blocking_by_domain] ? @preloaded_relations[:domain_blocking_by_domain][status.account_domain] : account.domain_blocking?(status.account_domain) - end - def muting_account? @preloaded_relations[:muting] ? @preloaded_relations[:muting][status.account_id] : account.muting?(status.account_id) end diff --git a/app/lib/status_finder.rb b/app/lib/status_finder.rb index 4d1aed29..22ced8bf 100644 --- a/app/lib/status_finder.rb +++ b/app/lib/status_finder.rb @@ -13,8 +13,6 @@ class StatusFinder raise ActiveRecord::RecordNotFound unless TagManager.instance.local_url?(url) case recognized_params[:controller] - when 'stream_entries' - StreamEntry.find(recognized_params[:id]).status when 'statuses' Status.find(recognized_params[:id]) else diff --git a/app/lib/tag_manager.rb b/app/lib/tag_manager.rb index fb364cb9..f9a3ac41 100644 --- a/app/lib/tag_manager.rb +++ b/app/lib/tag_manager.rb @@ -39,9 +39,9 @@ class TagManager case target.object_type when :person - short_account_url(target) + "/#{target.username}" when :note, :comment, :activity - short_account_status_url(target.account, target) + "/#{target.account.username}/posts/#{target.id}" end end end diff --git a/app/lib/user_settings_decorator.rb b/app/lib/user_settings_decorator.rb index 401e87cf..bcbf3081 100644 --- a/app/lib/user_settings_decorator.rb +++ b/app/lib/user_settings_decorator.rb @@ -30,7 +30,6 @@ class UserSettingsDecorator user.settings['theme'] = theme_preference if change?('setting_theme') user.settings['hide_network'] = hide_network_preference if change?('setting_hide_network') user.settings['aggregate_reblogs'] = aggregate_reblogs_preference if change?('setting_aggregate_reblogs') - user.settings['show_application'] = show_application_preference if change?('setting_show_application') user.settings['group_in_home_feed'] = group_in_home_feed_preference if change?('setting_group_in_home_feed') end @@ -82,10 +81,6 @@ class UserSettingsDecorator boolean_cast_setting 'setting_hide_network' end - def show_application_preference - boolean_cast_setting 'setting_show_application' - end - def theme_preference settings['setting_theme'] end diff --git a/app/lib/webfinger_resource.rb b/app/lib/webfinger_resource.rb deleted file mode 100644 index a54a702a..00000000 --- a/app/lib/webfinger_resource.rb +++ /dev/null @@ -1,66 +0,0 @@ -# frozen_string_literal: true - -class WebfingerResource - attr_reader :resource - - def initialize(resource) - @resource = resource - end - - def username - case resource - when /\Ahttps?/i - username_from_url - when /\@/ - username_from_acct - else - raise(ActiveRecord::RecordNotFound) - end - end - - private - - def username_from_url - if account_show_page? - path_params[:username] - else - raise ActiveRecord::RecordNotFound - end - end - - def account_show_page? - path_params[:controller] == 'accounts' && path_params[:action] == 'show' - end - - def path_params - Rails.application.routes.recognize_path(resource) - end - - def username_from_acct - if domain_matches_local? - local_username - else - raise ActiveRecord::RecordNotFound - end - end - - def split_acct - resource_without_acct_string.split('@') - end - - def resource_without_acct_string - resource.gsub(/\Aacct:/, '') - end - - def local_username - split_acct.first - end - - def local_domain - split_acct.last - end - - def domain_matches_local? - TagManager.instance.local_domain?(local_domain) || TagManager.instance.web_domain?(local_domain) - end -end diff --git a/app/mailers/admin_mailer.rb b/app/mailers/admin_mailer.rb index db154cad..3b116555 100644 --- a/app/mailers/admin_mailer.rb +++ b/app/mailers/admin_mailer.rb @@ -3,7 +3,7 @@ class AdminMailer < ApplicationMailer layout 'plain_mailer' - helper :stream_entries + helper :statuses def new_report(recipient, report) @report = report @@ -15,13 +15,4 @@ class AdminMailer < ApplicationMailer end end - def new_pending_account(recipient, user) - @account = user.account - @me = recipient - @instance = Rails.configuration.x.local_domain - - locale_for_account(@me) do - mail to: @me.user_email, subject: I18n.t('admin_mailer.new_pending_account.subject', instance: @instance, username: @account.username) - end - end end diff --git a/app/mailers/notification_mailer.rb b/app/mailers/notification_mailer.rb index 66fa337c..723d901f 100644 --- a/app/mailers/notification_mailer.rb +++ b/app/mailers/notification_mailer.rb @@ -1,7 +1,7 @@ # frozen_string_literal: true class NotificationMailer < ApplicationMailer - helper :stream_entries + helper :statuses add_template_helper RoutingHelper diff --git a/app/mailers/user_mailer.rb b/app/mailers/user_mailer.rb index cbe5e323..94c007b5 100644 --- a/app/mailers/user_mailer.rb +++ b/app/mailers/user_mailer.rb @@ -148,7 +148,7 @@ class UserMailer < Devise::Mailer I18n.with_locale(@resource.locale || I18n.default_locale) do mail to: @resource.email, subject: I18n.t("user_mailer.warning.subject.#{@warning.action}", acct: "@#{user.account.local_username_and_domain}"), - reply_to: Setting.site_contact_email + reply_to: 'support@gab.com' end end diff --git a/app/models/account.rb b/app/models/account.rb index 6f31615c..41840714 100644 --- a/app/models/account.rb +++ b/app/models/account.rb @@ -35,7 +35,7 @@ # outbox_url :string default(""), not null # shared_inbox_url :string default(""), not null # followers_url :string default(""), not null -# protocol :integer default("ostatus"), not null +# protocol :integer default(0), not null # memorial :boolean default(FALSE), not null # moved_to_account_id :bigint(8) # featured_collection_url :string @@ -67,8 +67,6 @@ class Account < ApplicationRecord include AccountCounters include DomainNormalizable - enum protocol: [:ostatus, :activitypub] - validates :username, presence: true # Remote user validations @@ -85,7 +83,6 @@ class Account < ApplicationRecord scope :remote, -> { where.not(domain: nil) } scope :local, -> { where(domain: nil) } - scope :expiring, ->(time) { remote.where.not(subscription_expires_at: nil).where('subscription_expires_at < ?', time) } scope :partitioned, -> { order(Arel.sql('row_number() over (partition by domain)')) } scope :silenced, -> { where.not(silenced_at: nil) } scope :suspended, -> { where.not(suspended_at: nil) } @@ -110,13 +107,11 @@ class Account < ApplicationRecord :current_sign_in_at, :confirmed?, :approved?, - :pending?, :admin?, :moderator?, :staff?, :locale, :hides_network?, - :shows_application?, to: :user, prefix: true, allow_nil: true @@ -153,23 +148,6 @@ class Account < ApplicationRecord Follow.where(target_account_id: id).count end - def to_webfinger_s - "acct:#{local_username_and_domain}" - end - - def subscribed? - subscription_expires_at.present? - end - - def possibly_stale? - last_webfingered_at.nil? || last_webfingered_at <= 1.day.ago - end - - def refresh! - return if local? - ResolveAccountService.new.call(acct) - end - def silenced? silenced_at.present? end @@ -247,10 +225,6 @@ class Account < ApplicationRecord end end - def also_known_as - self[:also_known_as] || [] - end - def fields (self[:fields] || []).map { |f| Field.new(self, f) } end @@ -307,17 +281,11 @@ class Account < ApplicationRecord (['RSA'] + [modulus, exponent].map { |n| Base64.urlsafe_encode64(n) }).join('.') end - def subscription(webhook_url) - @subscription ||= OStatus2::Subscription.new(remote_url, secret: secret, webhook: webhook_url, hub: hub_url) - end - def save_with_optional_media! save! rescue ActiveRecord::RecordInvalid self.avatar = nil self.header = nil - self[:avatar_remote_url] = '' - self[:header_remote_url] = '' save! end @@ -400,11 +368,6 @@ class Account < ApplicationRecord reorder(nil).pluck(Arel.sql('distinct accounts.domain')) end - def inboxes - urls = reorder(nil).where(protocol: :activitypub).pluck(Arel.sql("distinct coalesce(nullif(accounts.shared_inbox_url, ''), accounts.inbox_url)")) - DeliveryFailureTracker.filter(urls) - end - def search_for(terms, limit = 10, offset = 0, options = {}) textsearch, query = generate_query_for_search(terms) @onlyVerified = options[:onlyVerified] || false diff --git a/app/models/account_domain_block.rb b/app/models/account_domain_block.rb deleted file mode 100644 index 7c0d6037..00000000 --- a/app/models/account_domain_block.rb +++ /dev/null @@ -1,32 +0,0 @@ -# frozen_string_literal: true -# == Schema Information -# -# Table name: account_domain_blocks -# -# id :bigint(8) not null, primary key -# domain :string -# created_at :datetime not null -# updated_at :datetime not null -# account_id :bigint(8) -# - -class AccountDomainBlock < ApplicationRecord - include Paginable - include DomainNormalizable - - belongs_to :account - validates :domain, presence: true, uniqueness: { scope: :account_id } - - after_commit :remove_blocking_cache - after_commit :remove_relationship_cache - - private - - def remove_blocking_cache - Rails.cache.delete("exclude_domains_for:#{account_id}") - end - - def remove_relationship_cache - Rails.cache.delete_matched("relationship:#{account_id}:*") - end -end diff --git a/app/models/account_identity_proof.rb b/app/models/account_identity_proof.rb deleted file mode 100644 index 10b66ccc..00000000 --- a/app/models/account_identity_proof.rb +++ /dev/null @@ -1,46 +0,0 @@ -# frozen_string_literal: true -# == Schema Information -# -# Table name: account_identity_proofs -# -# id :bigint(8) not null, primary key -# account_id :bigint(8) -# provider :string default(""), not null -# provider_username :string default(""), not null -# token :text default(""), not null -# verified :boolean default(FALSE), not null -# live :boolean default(FALSE), not null -# created_at :datetime not null -# updated_at :datetime not null -# - -class AccountIdentityProof < ApplicationRecord - belongs_to :account - - validates :provider, inclusion: { in: ProofProvider::SUPPORTED_PROVIDERS } - validates :provider_username, format: { with: /\A[a-z0-9_]+\z/i }, length: { minimum: 2, maximum: 30 } - validates :provider_username, uniqueness: { scope: [:account_id, :provider] } - validates :token, format: { with: /\A[a-f0-9]+\z/ }, length: { maximum: 66 } - - validate :validate_with_provider, if: :token_changed? - - scope :active, -> { where(verified: true, live: true) } - - after_commit :queue_worker, if: :saved_change_to_token? - - delegate :refresh!, :on_success_path, :badge, to: :provider_instance - - def provider_instance - @provider_instance ||= ProofProvider.find(provider, self) - end - - private - - def queue_worker - provider_instance.worker_class.perform_async(id) - end - - def validate_with_provider - provider_instance.validate! - end -end diff --git a/app/models/account_pin.rb b/app/models/account_pin.rb deleted file mode 100644 index b51d3d4c..00000000 --- a/app/models/account_pin.rb +++ /dev/null @@ -1,27 +0,0 @@ -# frozen_string_literal: true -# == Schema Information -# -# Table name: account_pins -# -# id :bigint(8) not null, primary key -# account_id :bigint(8) -# target_account_id :bigint(8) -# created_at :datetime not null -# updated_at :datetime not null -# - -class AccountPin < ApplicationRecord - include Paginable - include RelationshipCacheable - - belongs_to :account - belongs_to :target_account, class_name: 'Account' - - validate :validate_follow_relationship - - private - - def validate_follow_relationship - errors.add(:base, I18n.t('accounts.pin_errors.following')) unless account.following?(target_account) - end -end diff --git a/app/models/block.rb b/app/models/block.rb index bf3e0760..cc670f28 100644 --- a/app/models/block.rb +++ b/app/models/block.rb @@ -25,7 +25,6 @@ class Block < ApplicationRecord end after_commit :remove_blocking_cache - before_validation :set_uri, only: :create private @@ -33,8 +32,4 @@ class Block < ApplicationRecord Rails.cache.delete("exclude_account_ids_for:#{account_id}") Rails.cache.delete("exclude_account_ids_for:#{target_account_id}") end - - def set_uri - self.uri = ActivityPub::TagManager.instance.generate_uri_for(self) if uri.nil? - end end diff --git a/app/models/concerns/account_associations.rb b/app/models/concerns/account_associations.rb index c6bcc5a3..217b8d78 100644 --- a/app/models/concerns/account_associations.rb +++ b/app/models/concerns/account_associations.rb @@ -7,16 +7,11 @@ module AccountAssociations # Local users has_one :user, inverse_of: :account, dependent: :destroy - # Identity proofs - has_many :identity_proofs, class_name: 'AccountIdentityProof', dependent: :destroy, inverse_of: :account - # Timelines - has_many :stream_entries, inverse_of: :account, dependent: :destroy has_many :statuses, inverse_of: :account, dependent: :destroy has_many :favourites, inverse_of: :account, dependent: :destroy has_many :mentions, inverse_of: :account, dependent: :destroy has_many :notifications, inverse_of: :account, dependent: :destroy - has_many :conversations, class_name: 'AccountConversation', dependent: :destroy, inverse_of: :account has_many :scheduled_statuses, inverse_of: :account, dependent: :destroy # Pinned statuses @@ -27,10 +22,6 @@ module AccountAssociations has_many :status_pins, inverse_of: :account, dependent: :destroy has_many :pinned_statuses, -> { reorder('status_pins.created_at DESC') }, through: :status_pins, class_name: 'Status', source: :status - # Endorsements - has_many :account_pins, inverse_of: :account, dependent: :destroy - has_many :endorsed_accounts, through: :account_pins, class_name: 'Account', source: :target_account - # Media has_many :media_attachments, dependent: :destroy has_many :polls, dependent: :destroy @@ -63,7 +54,6 @@ module AccountAssociations # Hashtags has_and_belongs_to_many :tags - has_many :featured_tags, -> { includes(:tag) }, dependent: :destroy, inverse_of: :account # Billing has_many :transactions, class_name: 'Transaction', dependent: :destroy, inverse_of: :account diff --git a/app/models/concerns/account_finder_concern.rb b/app/models/concerns/account_finder_concern.rb index f0b93df6..e7c19503 100644 --- a/app/models/concerns/account_finder_concern.rb +++ b/app/models/concerns/account_finder_concern.rb @@ -8,10 +8,6 @@ module AccountFinderConcern find_local(username) || raise(ActiveRecord::RecordNotFound) end - def find_remote!(username, domain) - find_remote(username, domain) || raise(ActiveRecord::RecordNotFound) - end - def find_acct!(acct) find_acct(acct) || raise(ActiveRecord::RecordNotFound) end @@ -21,25 +17,24 @@ module AccountFinderConcern end def find_local(username) - find_remote(username, nil) - end - - def find_remote(username, domain) - AccountFinder.new(username, domain).account + find_now(username) end def find_acct(acct) username, domain = acct.split("@") - find_remote(username, domain) + find_now(username) + end + + def find_now(username) + AccountFinder.new(username).account end end class AccountFinder - attr_reader :username, :domain + attr_reader :username - def initialize(username, domain) + def initialize(username) @username = username - @domain = domain end def account @@ -65,11 +60,7 @@ module AccountFinderConcern end def matching_domain - if domain.nil? - Account.where(domain: nil) - else - Account.where(Account.arel_table[:domain].lower.eq domain.to_s.downcase) - end + Account.where(domain: nil) end end end diff --git a/app/models/concerns/account_interactions.rb b/app/models/concerns/account_interactions.rb index 053960b6..88032004 100644 --- a/app/models/concerns/account_interactions.rb +++ b/app/models/concerns/account_interactions.rb @@ -40,20 +40,6 @@ module AccountInteractions end end - def endorsed_map(target_account_ids, account_id) - follow_mapping(AccountPin.where(account_id: account_id, target_account_id: target_account_ids), :target_account_id) - end - - def domain_blocking_map(target_account_ids, account_id) - accounts_map = Account.where(id: target_account_ids).select('id, domain').each_with_object({}) { |a, h| h[a.id] = a.domain } - blocked_domains = domain_blocking_map_by_domain(accounts_map.values.compact, account_id) - accounts_map.reduce({}) { |h, (id, domain)| h.merge(id => blocked_domains[domain]) } - end - - def domain_blocking_map_by_domain(target_domains, account_id) - follow_mapping(AccountDomainBlock.where(account_id: account_id, domain: target_domains), :domain) - end - private def follow_mapping(query, field) @@ -85,8 +71,6 @@ module AccountInteractions has_many :muting, -> { order('mutes.id desc') }, through: :mute_relationships, source: :target_account has_many :muted_by_relationships, class_name: 'Mute', foreign_key: :target_account_id, dependent: :destroy has_many :muted_by, -> { order('mutes.id desc') }, through: :muted_by_relationships, source: :account - has_many :conversation_mutes, dependent: :destroy - has_many :domain_blocks, class_name: 'AccountDomainBlock', dependent: :destroy end def follow!(other_account, reblogs: nil, uri: nil) @@ -120,14 +104,6 @@ module AccountInteractions mute end - def mute_conversation!(conversation) - conversation_mutes.find_or_create_by!(conversation: conversation) - end - - def block_domain!(other_domain) - domain_blocks.find_or_create_by!(domain: other_domain) - end - def unfollow!(other_account) follow = active_relationships.find_by(target_account: other_account) follow&.destroy @@ -143,16 +119,6 @@ module AccountInteractions mute&.destroy end - def unmute_conversation!(conversation) - mute = conversation_mutes.find_by(conversation: conversation) - mute&.destroy! - end - - def unblock_domain!(other_domain) - block = domain_blocks.find_by(domain: other_domain) - block&.destroy - end - def following?(other_account) active_relationships.where(target_account: other_account).exists? end @@ -161,18 +127,10 @@ module AccountInteractions block_relationships.where(target_account: other_account).exists? end - def domain_blocking?(other_domain) - domain_blocks.where(domain: other_domain).exists? - end - def muting?(other_account) mute_relationships.where(target_account: other_account).exists? end - def muting_conversation?(conversation) - conversation_mutes.where(conversation: conversation).exists? - end - def muting_notifications?(other_account) mute_relationships.where(target_account: other_account, hide_notifications: true).exists? end @@ -201,10 +159,6 @@ module AccountInteractions status_pins.where(status: status).exists? end - def endorsed?(account) - account_pins.where(target_account: account).exists? - end - def followers_for_local_distribution followers.local .joins(:user) diff --git a/app/models/concerns/omniauthable.rb b/app/models/concerns/omniauthable.rb index 28303308..c940ac1b 100644 --- a/app/models/concerns/omniauthable.rb +++ b/app/models/concerns/omniauthable.rb @@ -44,9 +44,9 @@ module Omniauthable # verified email. If no verified email was provided or the user already # exists, we assign a temporary email and ask the user to verify it on # the next step via Auth::ConfirmationsController.finish_signup - + + # : TODO : remove, no sign up from app. only website user = User.new(user_params_from_auth(auth)) - user.account.avatar_remote_url = auth.info.image if auth.info.image =~ /\A#{URI.regexp(%w(http https))}\z/ user.skip_confirmation! user.save! user diff --git a/app/models/concerns/status_threading_concern.rb b/app/models/concerns/status_threading_concern.rb index 15eb695c..af4fa45a 100644 --- a/app/models/concerns/status_threading_concern.rb +++ b/app/models/concerns/status_threading_concern.rb @@ -122,7 +122,6 @@ module StatusThreadingConcern blocked_by: Account.blocked_by_map(account_ids, account.id), muting: Account.muting_map(account_ids, account.id), following: Account.following_map(account_ids, account.id), - domain_blocking_by_domain: Account.domain_blocking_map_by_domain(domains, account.id), } end diff --git a/app/models/concerns/streamable.rb b/app/models/concerns/streamable.rb deleted file mode 100644 index 7c9edb8e..00000000 --- a/app/models/concerns/streamable.rb +++ /dev/null @@ -1,43 +0,0 @@ -# frozen_string_literal: true - -module Streamable - extend ActiveSupport::Concern - - included do - has_one :stream_entry, as: :activity - - after_create do - account.stream_entries.create!(activity: self, hidden: hidden?) if needs_stream_entry? - end - end - - def title - super - end - - def content - title - end - - def target - super - end - - def object_type - :activity - end - - def thread - super - end - - def hidden? - false - end - - private - - def needs_stream_entry? - account.local? - end -end diff --git a/app/models/conversation_mute.rb b/app/models/conversation_mute.rb deleted file mode 100644 index 52c1a33e..00000000 --- a/app/models/conversation_mute.rb +++ /dev/null @@ -1,14 +0,0 @@ -# frozen_string_literal: true -# == Schema Information -# -# Table name: conversation_mutes -# -# id :bigint(8) not null, primary key -# conversation_id :bigint(8) not null -# account_id :bigint(8) not null -# - -class ConversationMute < ApplicationRecord - belongs_to :account - belongs_to :conversation -end diff --git a/app/models/custom_emoji.rb b/app/models/custom_emoji.rb index d3cc7050..7db7fdd3 100644 --- a/app/models/custom_emoji.rb +++ b/app/models/custom_emoji.rb @@ -12,7 +12,6 @@ # image_updated_at :datetime # created_at :datetime not null # updated_at :datetime not null -# disabled :boolean default(FALSE), not null # uri :string # image_remote_url :string # visible_in_picker :boolean default(TRUE), not null diff --git a/app/models/domain_block.rb b/app/models/domain_block.rb deleted file mode 100644 index 84c08c15..00000000 --- a/app/models/domain_block.rb +++ /dev/null @@ -1,42 +0,0 @@ -# frozen_string_literal: true -# == Schema Information -# -# Table name: domain_blocks -# -# id :bigint(8) not null, primary key -# domain :string default(""), not null -# created_at :datetime not null -# updated_at :datetime not null -# severity :integer default("silence") -# reject_media :boolean default(FALSE), not null -# reject_reports :boolean default(FALSE), not null -# - -class DomainBlock < ApplicationRecord - include DomainNormalizable - - enum severity: [:silence, :suspend, :noop] - - validates :domain, presence: true, uniqueness: true - - has_many :accounts, foreign_key: :domain, primary_key: :domain - delegate :count, to: :accounts, prefix: true - - scope :matches_domain, ->(value) { where(arel_table[:domain].matches("%#{value}%")) } - - def self.blocked?(domain) - where(domain: domain, severity: :suspend).exists? - end - - def stricter_than?(other_block) - return true if suspend? - return false if other_block.suspend? && (silence? || noop?) - return false if other_block.silence? && noop? - (reject_media || !other_block.reject_media) && (reject_reports || !other_block.reject_reports) - end - - def affected_accounts_count - scope = suspend? ? accounts.where(suspended_at: created_at) : accounts.where(silenced_at: created_at) - scope.count - end -end diff --git a/app/models/export.rb b/app/models/export.rb index 3b76699c..73144c73 100644 --- a/app/models/export.rb +++ b/app/models/export.rb @@ -39,14 +39,6 @@ class Export end end - def to_blocked_domains_csv - CSV.generate do |csv| - account.domain_blocks.pluck(:domain).each do |domain| - csv << [domain] - end - end - end - def total_storage account.media_attachments.sum(:file_file_size) end @@ -75,10 +67,6 @@ class Export account.muting.count end - def total_domain_blocks - account.domain_blocks.count - end - private def to_csv(accounts) diff --git a/app/models/featured_tag.rb b/app/models/featured_tag.rb deleted file mode 100644 index d06ae26a..00000000 --- a/app/models/featured_tag.rb +++ /dev/null @@ -1,47 +0,0 @@ -# frozen_string_literal: true -# == Schema Information -# -# Table name: featured_tags -# -# id :bigint(8) not null, primary key -# account_id :bigint(8) -# tag_id :bigint(8) -# statuses_count :bigint(8) default(0), not null -# last_status_at :datetime -# created_at :datetime not null -# updated_at :datetime not null -# - -class FeaturedTag < ApplicationRecord - belongs_to :account, inverse_of: :featured_tags, required: true - belongs_to :tag, inverse_of: :featured_tags, required: true - - delegate :name, to: :tag, allow_nil: true - - validates_associated :tag, on: :create - validates :name, presence: true, on: :create - validate :validate_featured_tags_limit, on: :create - - def name=(str) - self.tag = Tag.find_or_initialize_by(name: str.strip.delete('#').mb_chars.downcase.to_s) - end - - def increment(timestamp) - update(statuses_count: statuses_count + 1, last_status_at: timestamp) - end - - def decrement(deleted_status_id) - update(statuses_count: [0, statuses_count - 1].max, last_status_at: account.statuses.where(visibility: %i(public unlisted)).tagged_with(tag).where.not(id: deleted_status_id).select(:created_at).first&.created_at) - end - - def reset_data - self.statuses_count = account.statuses.where(visibility: %i(public unlisted)).tagged_with(tag).count - self.last_status_at = account.statuses.where(visibility: %i(public unlisted)).tagged_with(tag).select(:created_at).first&.created_at - end - - private - - def validate_featured_tags_limit - errors.add(:base, I18n.t('featured_tags.errors.limit')) if account.featured_tags.count >= 10 - end -end diff --git a/app/models/follow.rb b/app/models/follow.rb index 87fa1142..3e1268e8 100644 --- a/app/models/follow.rb +++ b/app/models/follow.rb @@ -31,25 +31,15 @@ class Follow < ApplicationRecord end def revoke_request! - FollowRequest.create!(account: account, target_account: target_account, show_reblogs: show_reblogs, uri: uri) + FollowRequest.create!(account: account, target_account: target_account) destroy! end - before_validation :set_uri, only: :create after_create :increment_cache_counters - after_destroy :remove_endorsements after_destroy :decrement_cache_counters private - def set_uri - self.uri = ActivityPub::TagManager.instance.generate_uri_for(self) if uri.nil? - end - - def remove_endorsements - AccountPin.where(target_account_id: target_account_id, account_id: account_id).delete_all - end - def increment_cache_counters account&.increment_count!(:following_count) target_account&.increment_count!(:followers_count) diff --git a/app/models/follow_request.rb b/app/models/follow_request.rb index 96ac7eaa..baea0536 100644 --- a/app/models/follow_request.rb +++ b/app/models/follow_request.rb @@ -25,7 +25,7 @@ class FollowRequest < ApplicationRecord validates_with FollowLimitValidator, on: :create def authorize! - account.follow!(target_account, reblogs: show_reblogs, uri: uri) + account.follow!(target_account) MergeWorker.perform_async(target_account.id, account.id) if account.local? destroy! end @@ -33,14 +33,6 @@ class FollowRequest < ApplicationRecord alias reject! destroy! def local? - false # Force uri_for to use uri attribute - end - - before_validation :set_uri, only: :create - - private - - def set_uri - self.uri = ActivityPub::TagManager.instance.generate_uri_for(self) if uri.nil? + false end end diff --git a/app/models/form/account_batch.rb b/app/models/form/account_batch.rb index 1b48a763..df9af02f 100644 --- a/app/models/form/account_batch.rb +++ b/app/models/form/account_batch.rb @@ -12,8 +12,6 @@ class Form::AccountBatch unfollow! when 'remove_from_followers' remove_from_followers! - when 'block_domains' - block_domains! when 'approve' approve! when 'reject' @@ -35,12 +33,6 @@ class Form::AccountBatch end end - def block_domains! - AfterAccountDomainBlockWorker.push_bulk(account_domains) do |domain| - [current_account.id, domain] - end - end - def account_domains accounts.pluck(Arel.sql('distinct domain')).compact end diff --git a/app/models/form/admin_settings.rb b/app/models/form/admin_settings.rb index e044c562..a6785bb6 100644 --- a/app/models/form/admin_settings.rb +++ b/app/models/form/admin_settings.rb @@ -9,47 +9,25 @@ class Form::AdminSettings site_title site_short_description site_description - site_extended_description - site_terms registrations_mode - closed_registrations_message - open_deletion - timeline_preview - show_staff_badge bootstrap_timeline_accounts theme min_invite_role - activity_api_enabled - peers_api_enabled - show_known_fediverse_at_about_page preview_sensitive_media - profile_directory thumbnail - hero - mascot ).freeze BOOLEAN_KEYS = %i( - open_deletion - timeline_preview - show_staff_badge - activity_api_enabled - peers_api_enabled - show_known_fediverse_at_about_page preview_sensitive_media - profile_directory ).freeze UPLOAD_KEYS = %i( thumbnail - hero - mascot ).freeze attr_accessor(*KEYS) validates :site_short_description, :site_description, html: { wrap_with: :p } - validates :site_extended_description, :site_terms, :closed_registrations_message, html: true validates :registrations_mode, inclusion: { in: %w(open approved none) } validates :min_invite_role, inclusion: { in: %w(disabled user moderator admin) } validates :site_contact_email, :site_contact_username, presence: true diff --git a/app/models/form/migration.rb b/app/models/form/migration.rb index c2a8655e..fedd8cdb 100644 --- a/app/models/form/migration.rb +++ b/app/models/form/migration.rb @@ -20,6 +20,6 @@ class Form::Migration private def set_account - self.account = (ResolveAccountService.new.call(acct) if account.nil? && acct.present?) + self.account = nil end end diff --git a/app/models/group.rb b/app/models/group.rb index 70def81e..4e847d65 100644 --- a/app/models/group.rb +++ b/app/models/group.rb @@ -56,6 +56,7 @@ class Group < ApplicationRecord record.errors.add(:base, I18n.t('groups.errors.limit')) if Group.where(account_id: value).count >= PER_ACCOUNT_LIMIT end + before_save :set_slug before_save :set_password before_destroy :clean_feed_manager after_create :add_owner_to_accounts @@ -80,6 +81,20 @@ class Group < ApplicationRecord password end end + + def set_slug + puts "tilly-5: " + slug.to_s + puts "tilly-6: " + self.member_count.to_s + + if !slug.nil? && self.member_count > 50 && self.slug.nil? + self.slug = slug.downcase.strip.gsub(' ', '-').gsub(/[^\w-]/, '') + elsif !slug.nil? && self.member_count < 50 && self.slug.nil? + self.slug = nil + else + self.slug = self.slug + end + end + def add_owner_to_accounts group_accounts << GroupAccount.new(account: account, role: :admin, write_permissions: true) end diff --git a/app/models/group_account.rb b/app/models/group_account.rb index 901f5810..44d1a423 100644 --- a/app/models/group_account.rb +++ b/app/models/group_account.rb @@ -13,6 +13,7 @@ class GroupAccount < ApplicationRecord self.ignored_columns = ["unread_count"] + # : todo : enum: 1,2,3,4,5... enum role: { admin: "admin", moderator: "moderator" diff --git a/app/models/import.rb b/app/models/import.rb deleted file mode 100644 index a7a0d806..00000000 --- a/app/models/import.rb +++ /dev/null @@ -1,42 +0,0 @@ -# frozen_string_literal: true -# == Schema Information -# -# Table name: imports -# -# id :bigint(8) not null, primary key -# type :integer not null -# approved :boolean default(FALSE), not null -# created_at :datetime not null -# updated_at :datetime not null -# data_file_name :string -# data_content_type :string -# data_file_size :integer -# data_updated_at :datetime -# account_id :bigint(8) not null -# overwrite :boolean default(FALSE), not null -# - -class Import < ApplicationRecord - FILE_TYPES = %w(text/plain text/csv).freeze - MODES = %i(merge overwrite).freeze - - self.inheritance_column = false - - belongs_to :account - - enum type: [:following, :blocking, :muting, :domain_blocking] - - validates :type, presence: true - - has_attached_file :data - validates_attachment_content_type :data, content_type: FILE_TYPES - validates_attachment_presence :data - - def mode - overwrite? ? :overwrite : :merge - end - - def mode=(str) - self.overwrite = str.to_sym == :overwrite - end -end diff --git a/app/models/invite.rb b/app/models/invite.rb deleted file mode 100644 index fe232246..00000000 --- a/app/models/invite.rb +++ /dev/null @@ -1,39 +0,0 @@ -# frozen_string_literal: true -# == Schema Information -# -# Table name: invites -# -# id :bigint(8) not null, primary key -# user_id :bigint(8) not null -# code :string default(""), not null -# expires_at :datetime -# max_uses :integer -# uses :integer default(0), not null -# created_at :datetime not null -# updated_at :datetime not null -# autofollow :boolean default(FALSE), not null -# - -class Invite < ApplicationRecord - include Expireable - - belongs_to :user - has_many :users, inverse_of: :invite - - scope :available, -> { where(expires_at: nil).or(where('expires_at >= ?', Time.now.utc)) } - - before_validation :set_code - - def valid_for_use? - (max_uses.nil? || uses < max_uses) && !expired? - end - - private - - def set_code - loop do - self.code = ([*('a'..'z'), *('A'..'Z'), *('0'..'9')] - %w(0 1 I l O)).sample(8).join - break if Invite.find_by(code: code).nil? - end - end -end diff --git a/app/models/invite_filter.rb b/app/models/invite_filter.rb deleted file mode 100644 index 7d89bad4..00000000 --- a/app/models/invite_filter.rb +++ /dev/null @@ -1,32 +0,0 @@ -# frozen_string_literal: true - -class InviteFilter - attr_reader :params - - def initialize(params) - @params = params - end - - def results - scope = Invite.order(created_at: :desc) - - params.each do |key, value| - scope.merge!(scope_for(key, value)) if value.present? - end - - scope - end - - private - - def scope_for(key, _value) - case key.to_s - when 'available' - Invite.available - when 'expired' - Invite.expired - else - raise "Unknown filter: #{key}" - end - end -end diff --git a/app/models/notification.rb b/app/models/notification.rb index 333134f6..e22d0a7b 100644 --- a/app/models/notification.rb +++ b/app/models/notification.rb @@ -16,6 +16,7 @@ class Notification < ApplicationRecord include Paginable include Cacheable + # : todo : enums, 1,2,3,4,5,... TYPE_CLASS_MAP = { mention: 'Mention', reblog: 'Status', diff --git a/app/models/poll.rb b/app/models/poll.rb index 8f72c7b1..e27b71da 100644 --- a/app/models/poll.rb +++ b/app/models/poll.rb @@ -46,10 +46,6 @@ class Poll < ApplicationRecord options.map.with_index { |title, key| Option.new(self, key.to_s, title, show_totals_now? ? cached_tallies[key] : nil) } end - def possibly_stale? - remote? && last_fetched_before_expiration? && time_passed_since_last_fetch? - end - def voted?(account) account.id == account_id || votes.where(account: account).exists? end @@ -94,15 +90,7 @@ class Poll < ApplicationRecord Rails.cache.delete("statuses/#{status_id}") end - def last_fetched_before_expiration? - last_fetched_at.nil? || expires_at.nil? || last_fetched_at < expires_at - end - - def time_passed_since_last_fetch? - last_fetched_at.nil? || last_fetched_at < 1.minute.ago - end - def show_totals_now? - expired? || !hide_totals? + expired? end end diff --git a/app/models/relay.rb b/app/models/relay.rb deleted file mode 100644 index 888e0d8e..00000000 --- a/app/models/relay.rb +++ /dev/null @@ -1,80 +0,0 @@ -# frozen_string_literal: true -# == Schema Information -# -# Table name: relays -# -# id :bigint(8) not null, primary key -# inbox_url :string default(""), not null -# follow_activity_id :string -# created_at :datetime not null -# updated_at :datetime not null -# state :integer default("idle"), not null -# - -class Relay < ApplicationRecord - PRESET_RELAY = 'https://relay.gab.com/inbox' - - validates :inbox_url, presence: true, uniqueness: true, url: true, if: :will_save_change_to_inbox_url? - - enum state: [:idle, :pending, :accepted, :rejected] - - scope :enabled, -> { accepted } - - before_destroy :ensure_disabled - - alias enabled? accepted? - - def enable! - activity_id = ActivityPub::TagManager.instance.generate_uri_for(nil) - payload = Oj.dump(follow_activity(activity_id)) - - update!(state: :pending, follow_activity_id: activity_id) - DeliveryFailureTracker.new(inbox_url).track_success! - ActivityPub::DeliveryWorker.perform_async(payload, some_local_account.id, inbox_url) - end - - def disable! - activity_id = ActivityPub::TagManager.instance.generate_uri_for(nil) - payload = Oj.dump(unfollow_activity(activity_id)) - - update!(state: :idle, follow_activity_id: nil) - DeliveryFailureTracker.new(inbox_url).track_success! - ActivityPub::DeliveryWorker.perform_async(payload, some_local_account.id, inbox_url) - end - - private - - def follow_activity(activity_id) - { - '@context': ActivityPub::TagManager::CONTEXT, - id: activity_id, - type: 'Follow', - actor: ActivityPub::TagManager.instance.uri_for(some_local_account), - object: ActivityPub::TagManager::COLLECTIONS[:public], - } - end - - def unfollow_activity(activity_id) - { - '@context': ActivityPub::TagManager::CONTEXT, - id: activity_id, - type: 'Undo', - actor: ActivityPub::TagManager.instance.uri_for(some_local_account), - object: { - id: follow_activity_id, - type: 'Follow', - actor: ActivityPub::TagManager.instance.uri_for(some_local_account), - object: ActivityPub::TagManager::COLLECTIONS[:public], - }, - } - end - - def some_local_account - @some_local_account ||= Account.representative - end - - def ensure_disabled - return unless enabled? - disable! - end -end diff --git a/app/models/remote_follow.rb b/app/models/remote_follow.rb deleted file mode 100644 index 2537de36..00000000 --- a/app/models/remote_follow.rb +++ /dev/null @@ -1,56 +0,0 @@ -# frozen_string_literal: true - -class RemoteFollow - include ActiveModel::Validations - - attr_accessor :acct, :addressable_template - - validates :acct, presence: true - - def initialize(attrs = nil) - @acct = attrs[:acct].gsub(/\A@/, '').strip if !attrs.nil? && !attrs[:acct].nil? - end - - def valid? - return false unless super - - populate_template - errors.empty? - end - - def subscribe_address_for(account) - addressable_template.expand(uri: account.local_username_and_domain).to_s - end - - def interact_address_for(status) - addressable_template.expand(uri: ActivityPub::TagManager.instance.uri_for(status)).to_s - end - - private - - def populate_template - if acct.blank? || redirect_url_link.nil? || redirect_url_link.template.nil? - missing_resource_error - else - @addressable_template = Addressable::Template.new(redirect_uri_template) - end - end - - def redirect_uri_template - redirect_url_link.template - end - - def redirect_url_link - acct_resource&.link('http://ostatus.org/schema/1.0/subscribe') - end - - def acct_resource - @_acct_resource ||= Goldfinger.finger("acct:#{acct}") - rescue Goldfinger::Error, HTTP::ConnectionError - nil - end - - def missing_resource_error - errors.add(:acct, I18n.t('remote_follow.missing_resource')) - end -end diff --git a/app/models/remote_profile.rb b/app/models/remote_profile.rb deleted file mode 100644 index 742d2b56..00000000 --- a/app/models/remote_profile.rb +++ /dev/null @@ -1,57 +0,0 @@ -# frozen_string_literal: true - -class RemoteProfile - include ActiveModel::Model - - attr_reader :document - - def initialize(body) - @document = Nokogiri::XML.parse(body, nil, 'utf-8') - end - - def root - @root ||= document.at_xpath('/atom:feed|/atom:entry', atom: OStatus::TagManager::XMLNS) - end - - def author - @author ||= root.at_xpath('./atom:author|./dfrn:owner', atom: OStatus::TagManager::XMLNS, dfrn: OStatus::TagManager::DFRN_XMLNS) - end - - def hub_link - @hub_link ||= link_href_from_xml(root, 'hub') - end - - def display_name - @display_name ||= author.at_xpath('./poco:displayName', poco: OStatus::TagManager::POCO_XMLNS)&.content - end - - def note - @note ||= author.at_xpath('./atom:summary|./poco:note', atom: OStatus::TagManager::XMLNS, poco: OStatus::TagManager::POCO_XMLNS)&.content - end - - def scope - @scope ||= author.at_xpath('./mastodon:scope', mastodon: OStatus::TagManager::MTDN_XMLNS)&.content - end - - def avatar - @avatar ||= link_href_from_xml(author, 'avatar') - end - - def header - @header ||= link_href_from_xml(author, 'header') - end - - def emojis - @emojis ||= author.xpath('./xmlns:link[@rel="emoji"]', xmlns: OStatus::TagManager::XMLNS) - end - - def locked? - scope == 'private' - end - - private - - def link_href_from_xml(xml, type) - xml.at_xpath(%(./atom:link[@rel="#{type}"]/@href), atom: OStatus::TagManager::XMLNS)&.content - end -end diff --git a/app/models/report.rb b/app/models/report.rb index 86c30379..5d43d9b1 100644 --- a/app/models/report.rb +++ b/app/models/report.rb @@ -33,8 +33,6 @@ class Report < ApplicationRecord false # Force uri_for to use uri attribute end - before_validation :set_uri, only: :create - def object_type :flag end @@ -97,7 +95,4 @@ class Report < ApplicationRecord Admin::ActionLog.from("(#{sql}) AS admin_action_logs") end - def set_uri - self.uri = ActivityPub::TagManager.instance.generate_uri_for(self) if uri.nil? && account.local? - end end diff --git a/app/models/shortcut.rb b/app/models/shortcut.rb index 49869268..04bdab65 100644 --- a/app/models/shortcut.rb +++ b/app/models/shortcut.rb @@ -12,6 +12,7 @@ # class Shortcut < ApplicationRecord + # : todo : enum 1,2, etc. # enum shortcut_type: { # account: 'account', # group: 'group' diff --git a/app/models/status.rb b/app/models/status.rb index 0e3d355f..c6d907ee 100644 --- a/app/models/status.rb +++ b/app/models/status.rb @@ -34,7 +34,6 @@ class Status < ApplicationRecord before_destroy :unlink_from_conversations include Paginable - include Streamable include Cacheable include StatusThreadingConcern @@ -48,7 +47,6 @@ class Status < ApplicationRecord :public, :unlisted, :private, - :direct, :limited, :private_group, ], _suffix: :visibility @@ -79,16 +77,14 @@ class Status < ApplicationRecord has_and_belongs_to_many :preview_cards has_one :notification, as: :activity, dependent: :destroy - has_one :stream_entry, as: :activity, inverse_of: :status has_one :status_stat, inverse_of: :status has_one :poll, inverse_of: :status, dependent: :destroy validates :uri, uniqueness: true, presence: true, unless: :local? validates :text, presence: true, unless: -> { with_media? || reblog? } validates_with StatusLengthValidator - validates_with DisallowedHashtagsValidator validates :reblog, uniqueness: { scope: :account }, if: :reblog? - validates :visibility, exclusion: { in: %w(direct limited) }, if: :reblog? + validates :visibility, exclusion: { in: %w(limited) }, if: :reblog? accepts_nested_attributes_for :poll @@ -127,13 +123,11 @@ class Status < ApplicationRecord :status_stat, :tags, :preview_cards, - :stream_entry, :preloadable_poll, account: :account_stat, active_mentions: { account: :account_stat }, reblog: [ :application, - :stream_entry, :tags, :preview_cards, :media_attachments, @@ -147,8 +141,6 @@ class Status < ApplicationRecord delegate :domain, to: :account, prefix: true - REAL_TIME_WINDOW = 6.hours - def searchable_by(preloaded = nil) ids = [account_id] @@ -181,10 +173,6 @@ class Status < ApplicationRecord !quote_of_id.nil? end - def within_realtime_window? - created_at >= REAL_TIME_WINDOW.ago - end - def verb if destroyed? :delete @@ -222,7 +210,7 @@ class Status < ApplicationRecord end def hidden? - private_visibility? || private_group_visibility? || direct_visibility? || limited_visibility? + private_visibility? || private_group_visibility? || limited_visibility? end def distributable? @@ -294,7 +282,7 @@ class Status < ApplicationRecord class << self def selectable_visibilities - visibilities.keys - %w(direct limited private_group) + visibilities.keys - %w(limited private_group) end def in_chosen_languages(account) @@ -315,57 +303,11 @@ class Status < ApplicationRecord where(group: groupIds, reply: false) end - def as_direct_timeline(account, limit = 20, max_id = nil, since_id = nil, cache_ids = false) - # direct timeline is mix of direct message from_me and to_me. - # 2 queries are executed with pagination. - # constant expression using arel_table is required for partial index - - # _from_me part does not require any timeline filters - query_from_me = where(account_id: account.id) - .where(Status.arel_table[:visibility].eq(3)) - .limit(limit) - .order('statuses.id DESC') - - # _to_me part requires mute and block filter. - # FIXME: may we check mutes.hide_notifications? - query_to_me = Status - .joins(:mentions) - .merge(Mention.where(account_id: account.id)) - .where(Status.arel_table[:visibility].eq(3)) - .limit(limit) - .order('mentions.status_id DESC') - .not_excluded_by_account(account) - - if max_id.present? - query_from_me = query_from_me.where('statuses.id < ?', max_id) - query_to_me = query_to_me.where('mentions.status_id < ?', max_id) - end - - if since_id.present? - query_from_me = query_from_me.where('statuses.id > ?', since_id) - query_to_me = query_to_me.where('mentions.status_id > ?', since_id) - end - - if cache_ids - # returns array of cache_ids object that have id and updated_at - (query_from_me.cache_ids.to_a + query_to_me.cache_ids.to_a).uniq(&:id).sort_by(&:id).reverse.take(limit) - else - # returns ActiveRecord.Relation - items = (query_from_me.select(:id).to_a + query_to_me.select(:id).to_a).uniq(&:id).sort_by(&:id).reverse.take(limit) - Status.where(id: items.map(&:id)) - end - end - def as_pro_timeline(account = nil) query = timeline_scope.without_replies.popular_accounts.where('statuses.updated_at > ?', 2.hours.ago) apply_timeline_filters(query, account) end - def as_public_timeline(account = nil) - query = timeline_scope.without_replies.where('statuses.updated_at > ?', 15.minutes.ago) - apply_timeline_filters(query, account) - end - def as_tag_timeline(tag, account = nil) query = timeline_scope.tagged_with(tag).without_replies @@ -388,10 +330,6 @@ class Status < ApplicationRecord select('reblog_of_id').where(reblog_of_id: status_ids).where(account_id: account_id).reorder(nil).each_with_object({}) { |s, h| h[s.reblog_of_id] = true } end - def mutes_map(conversation_ids, account_id) - ConversationMute.select('conversation_id').where(conversation_id: conversation_ids).where(account_id: account_id).each_with_object({}) { |m, h| h[m.conversation_id] = true } - end - def pins_map(status_ids, account_id) StatusPin.select('status_id').where(status_id: status_ids).where(account_id: account_id).each_with_object({}) { |p, h| h[p.status_id] = true } end @@ -490,7 +428,7 @@ class Status < ApplicationRecord end def store_uri - update_column(:uri, ActivityPub::TagManager.instance.uri_for(self)) if uri.nil? + update_column(:uri, "/#{self.account.username}/posts/#{self.id}") if uri.nil? end def prepare_contents @@ -556,15 +494,13 @@ class Status < ApplicationRecord end def increment_counter_caches - return if direct_visibility? - account&.increment_count!(:statuses_count) reblog&.increment_count!(:reblogs_count) if reblog? && (public_visibility? || unlisted_visibility?) thread&.increment_count!(:replies_count) if in_reply_to_id.present? && (public_visibility? || unlisted_visibility?) end def decrement_counter_caches - return if direct_visibility? || marked_for_mass_destruction? + return if marked_for_mass_destruction? account&.decrement_count!(:statuses_count) reblog&.decrement_count!(:reblogs_count) if reblog? && (public_visibility? || unlisted_visibility?) @@ -572,14 +508,14 @@ class Status < ApplicationRecord end def unlink_from_conversations - return unless direct_visibility? + # return unless direct_visibility? - mentioned_accounts = mentions.includes(:account).map(&:account) - inbox_owners = mentioned_accounts.select(&:local?) + (account.local? ? [account] : []) + # mentioned_accounts = mentions.includes(:account).map(&:account) + # inbox_owners = mentioned_accounts.select(&:local?) + (account.local? ? [account] : []) - inbox_owners.each do |inbox_owner| - AccountConversation.remove_status(inbox_owner, self) - end + # inbox_owners.each do |inbox_owner| + # AccountConversation.remove_status(inbox_owner, self) + # end end end diff --git a/app/models/stream_entry.rb b/app/models/stream_entry.rb deleted file mode 100644 index 1a9afc5c..00000000 --- a/app/models/stream_entry.rb +++ /dev/null @@ -1,59 +0,0 @@ -# frozen_string_literal: true -# == Schema Information -# -# Table name: stream_entries -# -# id :bigint(8) not null, primary key -# activity_id :bigint(8) -# activity_type :string -# created_at :datetime not null -# updated_at :datetime not null -# hidden :boolean default(FALSE), not null -# account_id :bigint(8) -# - -class StreamEntry < ApplicationRecord - include Paginable - - belongs_to :account, inverse_of: :stream_entries - belongs_to :activity, polymorphic: true - belongs_to :status, foreign_type: 'Status', foreign_key: 'activity_id', inverse_of: :stream_entry - - validates :account, :activity, presence: true - - STATUS_INCLUDES = [:account, :stream_entry, :conversation, :media_attachments, :tags, mentions: :account, reblog: [:stream_entry, :account, :conversation, :media_attachments, :tags, mentions: :account], thread: [:stream_entry, :account]].freeze - - default_scope { where(activity_type: 'Status') } - scope :recent, -> { reorder(id: :desc) } - scope :with_includes, -> { includes(:account, status: STATUS_INCLUDES) } - - delegate :target, :title, :content, :thread, - to: :status, - allow_nil: true - - def object_type - orphaned? || targeted? ? :activity : status.object_type - end - - def verb - orphaned? ? :delete : status.verb - end - - def targeted? - [:follow, :request_friend, :authorize, :reject, :unfollow, :block, :unblock, :share, :favorite].include? verb - end - - def threaded? - (verb == :favorite || object_type == :comment) && !thread.nil? - end - - def mentions - orphaned? ? [] : status.active_mentions.map(&:account) - end - - private - - def orphaned? - status.nil? - end -end diff --git a/app/models/subscription.rb b/app/models/subscription.rb deleted file mode 100644 index 79b81828..00000000 --- a/app/models/subscription.rb +++ /dev/null @@ -1,62 +0,0 @@ -# frozen_string_literal: true -# == Schema Information -# -# Table name: subscriptions -# -# id :bigint(8) not null, primary key -# callback_url :string default(""), not null -# secret :string -# expires_at :datetime -# confirmed :boolean default(FALSE), not null -# created_at :datetime not null -# updated_at :datetime not null -# last_successful_delivery_at :datetime -# domain :string -# account_id :bigint(8) not null -# - -class Subscription < ApplicationRecord - MIN_EXPIRATION = 1.day.to_i - MAX_EXPIRATION = 30.days.to_i - - belongs_to :account - - validates :callback_url, presence: true - validates :callback_url, uniqueness: { scope: :account_id } - - scope :confirmed, -> { where(confirmed: true) } - scope :future_expiration, -> { where(arel_table[:expires_at].gt(Time.now.utc)) } - scope :expired, -> { where(arel_table[:expires_at].lt(Time.now.utc)) } - scope :active, -> { confirmed.future_expiration } - - def lease_seconds=(value) - self.expires_at = future_expiration(value) - end - - def lease_seconds - (expires_at - Time.now.utc).to_i - end - - def expired? - Time.now.utc > expires_at - end - - before_validation :set_min_expiration - - private - - def future_expiration(value) - Time.now.utc + future_offset(value).seconds - end - - def future_offset(seconds) - [ - [MIN_EXPIRATION, seconds.to_i].max, - MAX_EXPIRATION, - ].min - end - - def set_min_expiration - self.lease_seconds = 0 unless expires_at - end -end diff --git a/app/models/tag.rb b/app/models/tag.rb index 88d65426..f34f8424 100644 --- a/app/models/tag.rb +++ b/app/models/tag.rb @@ -14,7 +14,6 @@ class Tag < ApplicationRecord has_and_belongs_to_many :accounts has_and_belongs_to_many :sample_accounts, -> { searchable.discoverable.popular.limit(3) }, class_name: 'Account' - has_many :featured_tags, dependent: :destroy, inverse_of: :tag has_one :account_tag_stat, dependent: :destroy HASHTAG_NAME_RE = '[[:word:]_]*[[:alpha:]_·][[:word:]_]*' diff --git a/app/models/trending_tags.rb b/app/models/trending_tags.rb deleted file mode 100644 index 148535c2..00000000 --- a/app/models/trending_tags.rb +++ /dev/null @@ -1,65 +0,0 @@ -# frozen_string_literal: true - -class TrendingTags - KEY = 'trending_tags' - EXPIRE_HISTORY_AFTER = 7.days.seconds - EXPIRE_TRENDS_AFTER = 1.day.seconds - THRESHOLD = 5 - - class << self - include Redisable - - def record_use!(tag, account, at_time = Time.now.utc) - return if disallowed_hashtags.include?(tag.name) || account.silenced? || account.bot? - - increment_historical_use!(tag.id, at_time) - increment_unique_use!(tag.id, account.id, at_time) - increment_vote!(tag.id, at_time) - end - - def get(limit) - key = "#{KEY}:#{Time.now.utc.beginning_of_day.to_i}" - tag_ids = redis.zrevrange(key, 0, limit - 1).map(&:to_i) - tags = Tag.where(id: tag_ids).to_a.each_with_object({}) { |tag, h| h[tag.id] = tag } - tag_ids.map { |tag_id| tags[tag_id] }.compact - end - - private - - def increment_historical_use!(tag_id, at_time) - key = "activity:tags:#{tag_id}:#{at_time.beginning_of_day.to_i}" - redis.incrby(key, 1) - redis.expire(key, EXPIRE_HISTORY_AFTER) - end - - def increment_unique_use!(tag_id, account_id, at_time) - key = "activity:tags:#{tag_id}:#{at_time.beginning_of_day.to_i}:accounts" - redis.pfadd(key, account_id) - redis.expire(key, EXPIRE_HISTORY_AFTER) - end - - def increment_vote!(tag_id, at_time) - key = "#{KEY}:#{at_time.beginning_of_day.to_i}" - expected = redis.pfcount("activity:tags:#{tag_id}:#{(at_time - 1.day).beginning_of_day.to_i}:accounts").to_f - expected = 1.0 if expected.zero? - observed = redis.pfcount("activity:tags:#{tag_id}:#{at_time.beginning_of_day.to_i}:accounts").to_f - - if expected > observed || observed < THRESHOLD - redis.zrem(key, tag_id.to_s) - else - score = ((observed - expected)**2) / expected - redis.zadd(key, score, tag_id.to_s) - end - - redis.expire(key, EXPIRE_TRENDS_AFTER) - end - - def disallowed_hashtags - return @disallowed_hashtags if defined?(@disallowed_hashtags) - - @disallowed_hashtags = Setting.disallowed_hashtags.nil? ? [] : Setting.disallowed_hashtags - @disallowed_hashtags = @disallowed_hashtags.split(' ') if @disallowed_hashtags.is_a? String - @disallowed_hashtags = @disallowed_hashtags.map(&:downcase) - end - end -end diff --git a/app/models/user.rb b/app/models/user.rb index ba9a33b6..a714f660 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -33,7 +33,6 @@ # account_id :bigint(8) not null # disabled :boolean default(FALSE), not null # moderator :boolean default(FALSE), not null -# invite_id :bigint(8) # remember_token :string # chosen_languages :string is an Array # created_by_application_id :bigint(8) @@ -43,6 +42,8 @@ # class User < ApplicationRecord + self.ignored_columns = ["{:column=>:invite}_id"] + include Settings::Extend include UserRoles @@ -69,24 +70,18 @@ class User < ApplicationRecord include LdapAuthenticable belongs_to :account, inverse_of: :user - belongs_to :invite, counter_cache: :uses, optional: true belongs_to :created_by_application, class_name: 'Doorkeeper::Application', optional: true accepts_nested_attributes_for :account has_many :applications, class_name: 'Doorkeeper::Application', as: :owner has_many :backups, inverse_of: :user - has_one :invite_request, class_name: 'UserInviteRequest', inverse_of: :user, dependent: :destroy - accepts_nested_attributes_for :invite_request, reject_if: ->(attributes) { attributes['text'].blank? } - validates :locale, inclusion: I18n.available_locales.map(&:to_s), if: :locale? - validates :unique_email, uniqueness: true, on: :create validates_with BlacklistedEmailValidator, on: :create validates_with EmailMxValidator, if: :validate_email_dns? validates :agreement, acceptance: { allow_nil: false, accept: [true, 'true', '1'] }, on: :create scope :recent, -> { order(id: :desc) } - scope :pending, -> { where(approved: false) } scope :approved, -> { where(approved: true) } scope :confirmed, -> { where.not(confirmed_at: nil) } scope :enabled, -> { where(disabled: false) } @@ -96,7 +91,6 @@ class User < ApplicationRecord scope :emailable, -> { confirmed.enabled.joins(:account).merge(Account.searchable) } before_validation :sanitize_languages - before_validation :set_unique_email before_create :set_approved after_create :prepare_new_user! @@ -109,24 +103,15 @@ class User < ApplicationRecord delegate :auto_play_gif, :default_sensitive, :unfollow_modal, :boost_modal, :delete_modal, :noindex, :theme, :display_media, :hide_network, - :expand_spoilers, :default_language, :aggregate_reblogs, :show_application, + :expand_spoilers, :default_language, :aggregate_reblogs, :group_in_home_feed, to: :settings, prefix: :setting, allow_nil: false - attr_reader :invite_code attr_writer :external def confirmed? confirmed_at.present? end - def invited? - invite_id.present? - end - - def valid_invitation? - invite_id.present? && invite.valid_for_use? - end - def disable! update!(disabled: true, last_sign_in_at: current_sign_in_at, @@ -138,8 +123,8 @@ class User < ApplicationRecord end def confirm - new_user = !confirmed? - self.approved = true if open_registrations? + new_user = !confirmed? + self.approved = true super @@ -149,8 +134,8 @@ class User < ApplicationRecord end def confirm! - new_user = !confirmed? - self.approved = true if open_registrations? + new_user = !confirmed? + self.approved = true skip_confirmation! save! @@ -158,18 +143,10 @@ class User < ApplicationRecord # prepare_new_user! if new_user && approved? end - def pending? - !approved? - end - def active_for_authentication? super && approved? end - def inactive_message - !approved? ? :pending : super - end - def approve! return if approved? @@ -200,10 +177,6 @@ class User < ApplicationRecord settings.notification_emails['report'] end - def allows_pending_account_emails? - settings.notification_emails['pending_account'] - end - def hides_network? @hides_network ||= settings.hide_network end @@ -212,10 +185,6 @@ class User < ApplicationRecord @aggregates_reblogs ||= settings.aggregate_reblogs end - def shows_application? - @shows_application ||= settings.show_application - end - def allows_group_in_home_feed? settings.group_in_home_feed end @@ -249,11 +218,6 @@ class User < ApplicationRecord session.web_push_subscription.nil? ? nil : session.web_push_subscription end - def invite_code=(code) - self.invite = Invite.find_by(code: code) if code.present? - @invite_code = code - end - def challenge # end @@ -294,11 +258,7 @@ class User < ApplicationRecord private def set_approved - self.approved = open_registrations? || valid_invitation? || external? - end - - def open_registrations? - Setting.registrations_mode == 'open' + self.approved = true end def external? @@ -345,12 +305,4 @@ class User < ApplicationRecord end end - def set_unique_email - user, domain = self.email.split('@') - user = user.split('+').first - if ((domain == 'gmail.com') || (domain == 'hotmail.com')) - user = user.gsub('.', '') - end - self.unique_email = "#{user}@#{domain}" - end end diff --git a/app/models/user_invite_request.rb b/app/models/user_invite_request.rb deleted file mode 100644 index 2b76c88b..00000000 --- a/app/models/user_invite_request.rb +++ /dev/null @@ -1,17 +0,0 @@ -# frozen_string_literal: true - -# == Schema Information -# -# Table name: user_invite_requests -# -# id :bigint(8) not null, primary key -# user_id :bigint(8) -# text :text -# created_at :datetime not null -# updated_at :datetime not null -# - -class UserInviteRequest < ApplicationRecord - belongs_to :user, inverse_of: :invite_request - validates :text, presence: true, length: { maximum: 420 } -end diff --git a/app/policies/domain_block_policy.rb b/app/policies/domain_block_policy.rb deleted file mode 100644 index 47c0a81a..00000000 --- a/app/policies/domain_block_policy.rb +++ /dev/null @@ -1,19 +0,0 @@ -# frozen_string_literal: true - -class DomainBlockPolicy < ApplicationPolicy - def index? - admin? - end - - def show? - admin? - end - - def create? - admin? - end - - def destroy? - admin? - end -end diff --git a/app/policies/instance_policy.rb b/app/policies/instance_policy.rb deleted file mode 100644 index a7382355..00000000 --- a/app/policies/instance_policy.rb +++ /dev/null @@ -1,11 +0,0 @@ -# frozen_string_literal: true - -class InstancePolicy < ApplicationPolicy - def index? - admin? - end - - def show? - admin? - end -end diff --git a/app/policies/invite_policy.rb b/app/policies/invite_policy.rb deleted file mode 100644 index 14236f78..00000000 --- a/app/policies/invite_policy.rb +++ /dev/null @@ -1,29 +0,0 @@ -# frozen_string_literal: true - -class InvitePolicy < ApplicationPolicy - def index? - staff? - end - - def create? - min_required_role? - end - - def deactivate_all? - admin? - end - - def destroy? - owner? || (Setting.min_invite_role == 'admin' ? admin? : staff?) - end - - private - - def owner? - record.user_id == current_user&.id - end - - def min_required_role? - current_user&.role?(Setting.min_invite_role) - end -end diff --git a/app/policies/relay_policy.rb b/app/policies/relay_policy.rb deleted file mode 100644 index bd75e219..00000000 --- a/app/policies/relay_policy.rb +++ /dev/null @@ -1,7 +0,0 @@ -# frozen_string_literal: true - -class RelayPolicy < ApplicationPolicy - def update? - admin? - end -end diff --git a/app/policies/status_policy.rb b/app/policies/status_policy.rb index dfe983cf..a8b05f18 100644 --- a/app/policies/status_policy.rb +++ b/app/policies/status_policy.rb @@ -42,7 +42,7 @@ class StatusPolicy < ApplicationPolicy private def requires_mention? - record.direct_visibility? || record.limited_visibility? + record.limited_visibility? end def owned? diff --git a/app/policies/subscription_policy.rb b/app/policies/subscription_policy.rb deleted file mode 100644 index ac9a8a6c..00000000 --- a/app/policies/subscription_policy.rb +++ /dev/null @@ -1,7 +0,0 @@ -# frozen_string_literal: true - -class SubscriptionPolicy < ApplicationPolicy - def index? - admin? - end -end diff --git a/app/presenters/account_relationships_presenter.rb b/app/presenters/account_relationships_presenter.rb index b05673a3..02929e45 100644 --- a/app/presenters/account_relationships_presenter.rb +++ b/app/presenters/account_relationships_presenter.rb @@ -1,9 +1,8 @@ # frozen_string_literal: true class AccountRelationshipsPresenter - attr_reader :following, :followed_by, :blocking, :blocked_by, - :muting, :requested, :domain_blocking, - :endorsed + attr_reader :following, :followed_by, :blocking, + :blocked_by, :muting, :requested def initialize(account_ids, current_account_id, **options) @account_ids = account_ids.map { |a| a.is_a?(Account) ? a.id : a } @@ -15,8 +14,6 @@ class AccountRelationshipsPresenter @blocked_by = cached[:blocked_by].merge(Account.blocked_by_map(@uncached_account_ids, @current_account_id)) @muting = cached[:muting].merge(Account.muting_map(@uncached_account_ids, @current_account_id)) @requested = cached[:requested].merge(Account.requested_map(@uncached_account_ids, @current_account_id)) - @domain_blocking = cached[:domain_blocking].merge(Account.domain_blocking_map(@uncached_account_ids, @current_account_id)) - @endorsed = cached[:endorsed].merge(Account.endorsed_map(@uncached_account_ids, @current_account_id)) cache_uncached! @@ -26,8 +23,6 @@ class AccountRelationshipsPresenter @blocked_by.merge!(options[:blocked_by_map] || {}) @muting.merge!(options[:muting_map] || {}) @requested.merge!(options[:requested_map] || {}) - @domain_blocking.merge!(options[:domain_blocking_map] || {}) - @endorsed.merge!(options[:endorsed_map] || {}) end private @@ -42,8 +37,6 @@ class AccountRelationshipsPresenter blocked_by: {}, muting: {}, requested: {}, - domain_blocking: {}, - endorsed: {}, } @uncached_account_ids = [] @@ -70,8 +63,6 @@ class AccountRelationshipsPresenter blocked_by: { account_id => blocked_by[account_id] }, muting: { account_id => muting[account_id] }, requested: { account_id => requested[account_id] }, - domain_blocking: { account_id => domain_blocking[account_id] }, - endorsed: { account_id => endorsed[account_id] }, } Rails.cache.write("relationship:#{@current_account_id}:#{account_id}", maps_for_account, expires_in: 1.day) diff --git a/app/presenters/instance_presenter.rb b/app/presenters/instance_presenter.rb index b43024b1..100bb9ba 100644 --- a/app/presenters/instance_presenter.rb +++ b/app/presenters/instance_presenter.rb @@ -6,9 +6,6 @@ class InstancePresenter :site_title, :site_short_description, :site_description, - :site_extended_description, - :site_terms, - :closed_registrations_message, to: Setting ) @@ -25,6 +22,7 @@ class InstancePresenter end def status_count + puts "tilly-hello-1" Rails.cache.fetch('local_status_count') { Account.local.joins(:account_stat).sum('account_stats.statuses_count') }.to_i end @@ -47,9 +45,5 @@ class InstancePresenter def thumbnail @thumbnail ||= Rails.cache.fetch('site_uploads/thumbnail') { SiteUpload.find_by(var: 'thumbnail') } end - - def hero - @hero ||= Rails.cache.fetch('site_uploads/hero') { SiteUpload.find_by(var: 'hero') } - end end diff --git a/app/presenters/status_relationships_presenter.rb b/app/presenters/status_relationships_presenter.rb index 6847e2b5..6ad4be2b 100644 --- a/app/presenters/status_relationships_presenter.rb +++ b/app/presenters/status_relationships_presenter.rb @@ -1,32 +1,18 @@ # frozen_string_literal: true class StatusRelationshipsPresenter - attr_reader :reblogs_map, :favourites_map, :mutes_map, :pins_map, :group_pins_map, :bookmarks_map + attr_reader :reblogs_map, :favourites_map, :group_pins_map def initialize(statuses, current_account_id = nil, **options) if current_account_id.nil? - @reblogs_map = {} + @reblogs_map = {} @favourites_map = {} - @mutes_map = {} - @bookmarks_map = {} - @pins_map = {} - @group_pins_map = {} else - statuses = statuses.compact - status_ids = statuses.flat_map { |s| [s.id, s.reblog_of_id, s.quote_of_id] }.uniq.compact - conversation_ids = statuses.map(&:conversation_id).compact.uniq - pinnable_status_ids = statuses.map(&:proper).select { |s| s.account_id == current_account_id && %w(public unlisted).include?(s.visibility) }.map(&:id) + statuses = statuses.compact + status_ids = statuses.flat_map { |s| [s.id, s.reblog_of_id, s.quote_of_id] }.uniq.compact - @reblogs_map = Status.reblogs_map(status_ids, current_account_id).merge(options[:reblogs_map] || {}) + @reblogs_map = Status.reblogs_map(status_ids, current_account_id).merge(options[:reblogs_map] || {}) @favourites_map = Status.favourites_map(status_ids, current_account_id).merge(options[:favourites_map] || {}) - @mutes_map = Status.mutes_map(conversation_ids, current_account_id).merge(options[:mutes_map] || {}) - @bookmarks_map = Status.bookmarks_map(status_ids, current_account_id).merge(options[:bookmarks_map] || {}) - @pins_map = Status.pins_map(pinnable_status_ids, current_account_id).merge(options[:pins_map] || {}) - if options[:group_id] - @group_pins_map = Status.group_pins_map(status_ids, options[:group_id]).merge(options[:group_pins_map] || {}) - else - @group_pins_map = {} - end end end end diff --git a/app/serializers/activitypub/accept_follow_serializer.rb b/app/serializers/activitypub/accept_follow_serializer.rb deleted file mode 100644 index 1c1c6ab7..00000000 --- a/app/serializers/activitypub/accept_follow_serializer.rb +++ /dev/null @@ -1,19 +0,0 @@ -# frozen_string_literal: true - -class ActivityPub::AcceptFollowSerializer < ActivityPub::Serializer - attributes :id, :type, :actor - - has_one :object, serializer: ActivityPub::FollowSerializer - - def id - [ActivityPub::TagManager.instance.uri_for(object.target_account), '#accepts/follows/', object.id].join - end - - def type - 'Accept' - end - - def actor - ActivityPub::TagManager.instance.uri_for(object.target_account) - end -end diff --git a/app/serializers/activitypub/activity_serializer.rb b/app/serializers/activitypub/activity_serializer.rb deleted file mode 100644 index 451c5bfe..00000000 --- a/app/serializers/activitypub/activity_serializer.rb +++ /dev/null @@ -1,51 +0,0 @@ -# frozen_string_literal: true - -class ActivityPub::ActivitySerializer < ActivityPub::Serializer - attributes :id, :type, :actor, :published, :to, :cc - - has_one :proper, key: :object, serializer: ActivityPub::NoteSerializer, if: :serialize_object? - attribute :proper_uri, key: :object, unless: :serialize_object? - attribute :atom_uri, if: :announce? - - def id - ActivityPub::TagManager.instance.activity_uri_for(object) - end - - def type - announce? ? 'Announce' : 'Create' - end - - def actor - ActivityPub::TagManager.instance.uri_for(object.account) - end - - def published - object.created_at.iso8601 - end - - def to - ActivityPub::TagManager.instance.to(object) - end - - def cc - ActivityPub::TagManager.instance.cc(object) - end - - def proper_uri - ActivityPub::TagManager.instance.uri_for(object.proper) - end - - def atom_uri - OStatus::TagManager.instance.uri_for(object) - end - - def announce? - object.reblog? - end - - def serialize_object? - return true unless announce? - # Serialize private self-reposts of local gabs - object.account == object.proper.account && object.proper.private_visibility? && object.local? - end -end diff --git a/app/serializers/activitypub/actor_serializer.rb b/app/serializers/activitypub/actor_serializer.rb deleted file mode 100644 index 1b00cd73..00000000 --- a/app/serializers/activitypub/actor_serializer.rb +++ /dev/null @@ -1,200 +0,0 @@ -# frozen_string_literal: true - -class ActivityPub::ActorSerializer < ActivityPub::Serializer - include RoutingHelper - - # Conditionally serialize Gab image for gab:// URLs - def self.serializer_for(object, options) - gab_image = object.is_a?(String) and object.start_with?('gab://') - if gab_image and options[:serializer] == ActivityPub::ImageSerializer - return ActivityPub::GabImageSerializer - end - super - end - - context :security - - context_extensions :manually_approves_followers, :featured, :also_known_as, - :moved_to, :property_value, :hashtag, :emoji, :identity_proof - - attributes :id, :type, :following, :followers, - :inbox, :outbox, :featured, - :preferred_username, :name, :summary, - :url, :manually_approves_followers - - has_one :public_key, serializer: ActivityPub::PublicKeySerializer - - has_many :virtual_tags, key: :tag - has_many :virtual_attachments, key: :attachment - - attribute :moved_to, if: :moved? - attribute :also_known_as, if: :also_known_as? - - class EndpointsSerializer < ActivityPub::Serializer - include RoutingHelper - - attributes :shared_inbox - - def shared_inbox - inbox_url - end - end - - has_one :endpoints, serializer: EndpointsSerializer - - has_one :icon, serializer: ActivityPub::ImageSerializer, if: :avatar_exists? - has_one :image, serializer: ActivityPub::ImageSerializer, if: :header_exists? - - delegate :moved?, to: :object - - def id - account_url(object) - end - - def type - object.bot? ? 'Service' : 'Person' - end - - def following - account_following_index_url(object) - end - - def followers - account_followers_url(object) - end - - def inbox - account_inbox_url(object) - end - - def outbox - account_outbox_url(object) - end - - def featured - account_collection_url(object, :featured) - end - - def endpoints - object - end - - def preferred_username - object.username - end - - def name - object.display_name - end - - def summary - Formatter.instance.simplified_format(object) - end - - def icon - return object.avatar if object.avatar? - return object.avatar_remote_url if is_gab_avatar? - end - - def image - return object.header if object.header? - return object.header_remote_url if is_gab_header? - end - - def public_key - object - end - - def url - short_account_url(object) - end - - def avatar_exists? - object.avatar? or is_gab_avatar? - end - - def header_exists? - object.header? or is_gab_header? - end - - def is_gab_avatar? - object.avatar_remote_url&.start_with?('gab://') or false - end - - def is_gab_header? - object.header_remote_url&.start_with?('gab://') or false - end - - def manually_approves_followers - object.locked - end - - def virtual_tags - object.emojis + object.tags - end - - def virtual_attachments - object.fields + object.identity_proofs.active - end - - def moved_to - ActivityPub::TagManager.instance.uri_for(object.moved_to_account) - end - - def also_known_as? - !object.also_known_as.empty? - end - - class CustomEmojiSerializer < ActivityPub::EmojiSerializer - end - - class TagSerializer < ActivityPub::Serializer - include RoutingHelper - - attributes :type, :href, :name - - def type - 'Hashtag' - end - - def href - explore_hashtag_url(object) - end - - def name - "##{object.name}" - end - end - - class Account::FieldSerializer < ActivityPub::Serializer - attributes :type, :name, :value - - def type - 'PropertyValue' - end - - def value - Formatter.instance.format_field(object.account, object.value) - end - end - - class AccountIdentityProofSerializer < ActivityPub::Serializer - attributes :type, :name, :signature_algorithm, :signature_value - - def type - 'IdentityProof' - end - - def name - object.provider_username - end - - def signature_algorithm - object.provider - end - - def signature_value - object.token - end - end -end diff --git a/app/serializers/activitypub/add_serializer.rb b/app/serializers/activitypub/add_serializer.rb deleted file mode 100644 index 6f5aab17..00000000 --- a/app/serializers/activitypub/add_serializer.rb +++ /dev/null @@ -1,24 +0,0 @@ -# frozen_string_literal: true - -class ActivityPub::AddSerializer < ActivityPub::Serializer - include RoutingHelper - - attributes :type, :actor, :target - attribute :proper_object, key: :object - - def type - 'Add' - end - - def actor - ActivityPub::TagManager.instance.uri_for(object.account) - end - - def proper_object - ActivityPub::TagManager.instance.uri_for(object) - end - - def target - account_collection_url(object.account, :featured) - end -end diff --git a/app/serializers/activitypub/block_serializer.rb b/app/serializers/activitypub/block_serializer.rb deleted file mode 100644 index e6c69329..00000000 --- a/app/serializers/activitypub/block_serializer.rb +++ /dev/null @@ -1,22 +0,0 @@ -# frozen_string_literal: true - -class ActivityPub::BlockSerializer < ActivityPub::Serializer - attributes :id, :type, :actor - attribute :virtual_object, key: :object - - def id - ActivityPub::TagManager.instance.uri_for(object) || [ActivityPub::TagManager.instance.uri_for(object.account), '#blocks/', object.id].join - end - - def type - 'Block' - end - - def actor - ActivityPub::TagManager.instance.uri_for(object.account) - end - - def virtual_object - ActivityPub::TagManager.instance.uri_for(object.target_account) - end -end diff --git a/app/serializers/activitypub/collection_serializer.rb b/app/serializers/activitypub/collection_serializer.rb deleted file mode 100644 index da1ba735..00000000 --- a/app/serializers/activitypub/collection_serializer.rb +++ /dev/null @@ -1,43 +0,0 @@ -# frozen_string_literal: true - -class ActivityPub::CollectionSerializer < ActivityPub::Serializer - def self.serializer_for(model, options) - return ActivityPub::NoteSerializer if model.class.name == 'Status' - return ActivityPub::CollectionSerializer if model.class.name == 'ActivityPub::CollectionPresenter' - super - end - - attribute :id, if: -> { object.id.present? } - attribute :type - attribute :total_items, if: -> { object.size.present? } - attribute :next, if: -> { object.next.present? } - attribute :prev, if: -> { object.prev.present? } - attribute :part_of, if: -> { object.part_of.present? } - - has_one :first, if: -> { object.first.present? } - has_one :last, if: -> { object.last.present? } - has_many :items, key: :items, if: -> { (!object.items.nil? || page?) && !ordered? } - has_many :items, key: :ordered_items, if: -> { (!object.items.nil? || page?) && ordered? } - - def type - if page? - ordered? ? 'OrderedCollectionPage' : 'CollectionPage' - else - ordered? ? 'OrderedCollection' : 'Collection' - end - end - - def total_items - object.size - end - - private - - def ordered? - object.type == :ordered - end - - def page? - object.part_of.present? || object.page.present? - end -end diff --git a/app/serializers/activitypub/delete_actor_serializer.rb b/app/serializers/activitypub/delete_actor_serializer.rb deleted file mode 100644 index a6c5e238..00000000 --- a/app/serializers/activitypub/delete_actor_serializer.rb +++ /dev/null @@ -1,26 +0,0 @@ -# frozen_string_literal: true - -class ActivityPub::DeleteActorSerializer < ActivityPub::Serializer - attributes :id, :type, :actor, :to - attribute :virtual_object, key: :object - - def id - [ActivityPub::TagManager.instance.uri_for(object), '#delete'].join - end - - def type - 'Delete' - end - - def actor - ActivityPub::TagManager.instance.uri_for(object) - end - - def virtual_object - actor - end - - def to - [ActivityPub::TagManager::COLLECTIONS[:public]] - end -end diff --git a/app/serializers/activitypub/delete_serializer.rb b/app/serializers/activitypub/delete_serializer.rb deleted file mode 100644 index a7d5bd46..00000000 --- a/app/serializers/activitypub/delete_serializer.rb +++ /dev/null @@ -1,41 +0,0 @@ -# frozen_string_literal: true - -class ActivityPub::DeleteSerializer < ActivityPub::Serializer - class TombstoneSerializer < ActivityPub::Serializer - context_extensions :atom_uri - - attributes :id, :type, :atom_uri - - def id - ActivityPub::TagManager.instance.uri_for(object) - end - - def type - 'Tombstone' - end - - def atom_uri - OStatus::TagManager.instance.uri_for(object) - end - end - - attributes :id, :type, :actor, :to - - has_one :object, serializer: TombstoneSerializer - - def id - [ActivityPub::TagManager.instance.uri_for(object), '#delete'].join - end - - def type - 'Delete' - end - - def actor - ActivityPub::TagManager.instance.uri_for(object.account) - end - - def to - [ActivityPub::TagManager::COLLECTIONS[:public]] - end -end diff --git a/app/serializers/activitypub/emoji_serializer.rb b/app/serializers/activitypub/emoji_serializer.rb deleted file mode 100644 index 4dc38f3e..00000000 --- a/app/serializers/activitypub/emoji_serializer.rb +++ /dev/null @@ -1,31 +0,0 @@ -# frozen_string_literal: true - -class ActivityPub::EmojiSerializer < ActivityPub::Serializer - include RoutingHelper - - context_extensions :emoji - - attributes :id, :type, :name, :updated - - has_one :icon, serializer: ActivityPub::ImageSerializer - - def id - ActivityPub::TagManager.instance.uri_for(object) - end - - def type - 'Emoji' - end - - def icon - object.image - end - - def updated - object.updated_at.iso8601 - end - - def name - ":#{object.shortcode}:" - end -end diff --git a/app/serializers/activitypub/flag_serializer.rb b/app/serializers/activitypub/flag_serializer.rb deleted file mode 100644 index 2f2a707d..00000000 --- a/app/serializers/activitypub/flag_serializer.rb +++ /dev/null @@ -1,26 +0,0 @@ -# frozen_string_literal: true - -class ActivityPub::FlagSerializer < ActivityPub::Serializer - attributes :id, :type, :actor, :content - attribute :virtual_object, key: :object - - def id - ActivityPub::TagManager.instance.uri_for(object) - end - - def type - 'Flag' - end - - def actor - ActivityPub::TagManager.instance.uri_for(instance_options[:account] || object.account) - end - - def virtual_object - [ActivityPub::TagManager.instance.uri_for(object.target_account)] + object.statuses.map { |s| ActivityPub::TagManager.instance.uri_for(s) } - end - - def content - object.comment - end -end diff --git a/app/serializers/activitypub/follow_serializer.rb b/app/serializers/activitypub/follow_serializer.rb deleted file mode 100644 index 9228d771..00000000 --- a/app/serializers/activitypub/follow_serializer.rb +++ /dev/null @@ -1,22 +0,0 @@ -# frozen_string_literal: true - -class ActivityPub::FollowSerializer < ActivityPub::Serializer - attributes :id, :type, :actor - attribute :virtual_object, key: :object - - def id - ActivityPub::TagManager.instance.uri_for(object) || [ActivityPub::TagManager.instance.uri_for(object.account), '#follows/', object.id].join - end - - def type - 'Follow' - end - - def actor - ActivityPub::TagManager.instance.uri_for(object.account) - end - - def virtual_object - ActivityPub::TagManager.instance.uri_for(object.target_account) - end -end diff --git a/app/serializers/activitypub/gab_image_serializer.rb b/app/serializers/activitypub/gab_image_serializer.rb deleted file mode 100644 index ae2f6f64..00000000 --- a/app/serializers/activitypub/gab_image_serializer.rb +++ /dev/null @@ -1,11 +0,0 @@ -# frozen_string_literal: true - -class ActivityPub::GabImageSerializer < ActivityPub::ImageSerializer - def url - object - .sub('gab://avatar/', 'https://gab.com/media/user/') - .sub('gab://header/', 'https://gab.com/media/user/') - end - - def media_type; end -end diff --git a/app/serializers/activitypub/image_serializer.rb b/app/serializers/activitypub/image_serializer.rb deleted file mode 100644 index 1060f969..00000000 --- a/app/serializers/activitypub/image_serializer.rb +++ /dev/null @@ -1,30 +0,0 @@ -# frozen_string_literal: true - -class ActivityPub::ImageSerializer < ActivityPub::Serializer - include RoutingHelper - - context_extensions :focal_point - - attributes :type, :media_type, :url - attribute :focal_point, if: :focal_point? - - def type - 'Image' - end - - def url - full_asset_url(object.url(:original)) - end - - def media_type - object.content_type - end - - def focal_point? - object.respond_to?(:meta) && object.meta.is_a?(Hash) && object.meta['focus'].is_a?(Hash) - end - - def focal_point - [object.meta['focus']['x'], object.meta['focus']['y']] - end -end diff --git a/app/serializers/activitypub/like_serializer.rb b/app/serializers/activitypub/like_serializer.rb deleted file mode 100644 index 0f170ddb..00000000 --- a/app/serializers/activitypub/like_serializer.rb +++ /dev/null @@ -1,22 +0,0 @@ -# frozen_string_literal: true - -class ActivityPub::LikeSerializer < ActivityPub::Serializer - attributes :id, :type, :actor - attribute :virtual_object, key: :object - - def id - [ActivityPub::TagManager.instance.uri_for(object.account), '#likes/', object.id].join - end - - def type - 'Like' - end - - def actor - ActivityPub::TagManager.instance.uri_for(object.account) - end - - def virtual_object - ActivityPub::TagManager.instance.uri_for(object.status) - end -end diff --git a/app/serializers/activitypub/note_serializer.rb b/app/serializers/activitypub/note_serializer.rb deleted file mode 100644 index 67f596e7..00000000 --- a/app/serializers/activitypub/note_serializer.rb +++ /dev/null @@ -1,250 +0,0 @@ -# frozen_string_literal: true - -class ActivityPub::NoteSerializer < ActivityPub::Serializer - context_extensions :atom_uri, :conversation, :sensitive, - :hashtag, :emoji, :focal_point, :blurhash - - attributes :id, :type, :summary, - :in_reply_to, :published, :url, - :attributed_to, :to, :cc, :sensitive, - :atom_uri, :in_reply_to_atom_uri, - :conversation - - attribute :content - attribute :content_map, if: :language? - - has_many :media_attachments, key: :attachment - has_many :virtual_tags, key: :tag - - has_one :replies, serializer: ActivityPub::CollectionSerializer, if: :local? - - has_many :poll_options, key: :one_of, if: :poll_and_not_multiple? - has_many :poll_options, key: :any_of, if: :poll_and_multiple? - - attribute :end_time, if: :poll_and_expires? - attribute :closed, if: :poll_and_expired? - - def id - ActivityPub::TagManager.instance.uri_for(object) - end - - def type - object.preloadable_poll ? 'Question' : 'Note' - end - - def summary - object.spoiler_text.presence - end - - def content - Formatter.instance.format(object) - end - - def content_map - { object.language => Formatter.instance.format(object) } - end - - def replies - replies = object.self_replies(5).pluck(:id, :uri) - last_id = replies.last&.first - - ActivityPub::CollectionPresenter.new( - type: :unordered, - id: ActivityPub::TagManager.instance.replies_uri_for(object), - first: ActivityPub::CollectionPresenter.new( - type: :unordered, - part_of: ActivityPub::TagManager.instance.replies_uri_for(object), - items: replies.map(&:second), - next: last_id ? ActivityPub::TagManager.instance.replies_uri_for(object, page: true, min_id: last_id) : nil - ) - ) - end - - def language? - object.language.present? - end - - def in_reply_to - return unless object.reply? && !object.thread.nil? - - if object.thread.uri.nil? || object.thread.uri.start_with?('http') - ActivityPub::TagManager.instance.uri_for(object.thread) - else - object.thread.url - end - end - - def published - object.created_at.iso8601 - end - - def url - ActivityPub::TagManager.instance.url_for(object) - end - - def attributed_to - ActivityPub::TagManager.instance.uri_for(object.account) - end - - def to - ActivityPub::TagManager.instance.to(object) - end - - def cc - ActivityPub::TagManager.instance.cc(object) - end - - def virtual_tags - object.active_mentions.to_a.sort_by(&:id) + object.tags + object.emojis - end - - def atom_uri - return unless object.local? - - OStatus::TagManager.instance.uri_for(object) - end - - def in_reply_to_atom_uri - return unless object.reply? && !object.thread.nil? - - OStatus::TagManager.instance.uri_for(object.thread) - end - - def conversation - return if object.conversation.nil? - - if object.conversation.uri? - object.conversation.uri - else - OStatus::TagManager.instance.unique_tag(object.conversation.created_at, object.conversation.id, 'Conversation') - end - end - - def local? - object.account.local? - end - - def poll_options - object.preloadable_poll.loaded_options - end - - def poll_and_multiple? - object.preloadable_poll&.multiple? - end - - def poll_and_not_multiple? - object.preloadable_poll && !object.preloadable_poll.multiple? - end - - def closed - object.preloadable_poll.expires_at.iso8601 - end - - alias end_time closed - - def poll_and_expires? - object.preloadable_poll&.expires_at&.present? - end - - def poll_and_expired? - object.preloadable_poll&.expired? - end - - class MediaAttachmentSerializer < ActivityPub::Serializer - include RoutingHelper - - attributes :type, :media_type, :url, :name, :blurhash - attribute :focal_point, if: :focal_point? - - def type - 'Document' - end - - def name - object.description - end - - def media_type - object.file_content_type - end - - def url - object.local? ? full_asset_url(object.file.url(:original, false)) : object.remote_url - end - - def focal_point? - object.file.meta.is_a?(Hash) && object.file.meta['focus'].is_a?(Hash) - end - - def focal_point - [object.file.meta['focus']['x'], object.file.meta['focus']['y']] - end - end - - class MentionSerializer < ActivityPub::Serializer - attributes :type, :href, :name - - def type - 'Mention' - end - - def href - ActivityPub::TagManager.instance.uri_for(object.account) - end - - def name - "@#{object.account.acct}" - end - end - - class TagSerializer < ActivityPub::Serializer - include RoutingHelper - - attributes :type, :href, :name - - def type - 'Hashtag' - end - - def href - tag_url(object) - end - - def name - "##{object.name}" - end - end - - class CustomEmojiSerializer < ActivityPub::EmojiSerializer - end - - class OptionSerializer < ActivityPub::Serializer - class RepliesSerializer < ActivityPub::Serializer - attributes :type, :total_items - - def type - 'Collection' - end - - def total_items - object.votes_count - end - end - - attributes :type, :name - - has_one :replies, serializer: ActivityPub::NoteSerializer::OptionSerializer::RepliesSerializer - - def type - 'Note' - end - - def name - object.title - end - - def replies - object - end - end -end diff --git a/app/serializers/activitypub/outbox_serializer.rb b/app/serializers/activitypub/outbox_serializer.rb deleted file mode 100644 index 48fbad0f..00000000 --- a/app/serializers/activitypub/outbox_serializer.rb +++ /dev/null @@ -1,8 +0,0 @@ -# frozen_string_literal: true - -class ActivityPub::OutboxSerializer < ActivityPub::CollectionSerializer - def self.serializer_for(model, options) - return ActivityPub::ActivitySerializer if model.is_a?(Status) - super - end -end diff --git a/app/serializers/activitypub/public_key_serializer.rb b/app/serializers/activitypub/public_key_serializer.rb deleted file mode 100644 index 62ed49e8..00000000 --- a/app/serializers/activitypub/public_key_serializer.rb +++ /dev/null @@ -1,19 +0,0 @@ -# frozen_string_literal: true - -class ActivityPub::PublicKeySerializer < ActivityPub::Serializer - context :security - - attributes :id, :owner, :public_key_pem - - def id - [ActivityPub::TagManager.instance.uri_for(object), '#main-key'].join - end - - def owner - ActivityPub::TagManager.instance.uri_for(object) - end - - def public_key_pem - object.public_key - end -end diff --git a/app/serializers/activitypub/reject_follow_serializer.rb b/app/serializers/activitypub/reject_follow_serializer.rb deleted file mode 100644 index 4996c9a3..00000000 --- a/app/serializers/activitypub/reject_follow_serializer.rb +++ /dev/null @@ -1,19 +0,0 @@ -# frozen_string_literal: true - -class ActivityPub::RejectFollowSerializer < ActivityPub::Serializer - attributes :id, :type, :actor - - has_one :object, serializer: ActivityPub::FollowSerializer - - def id - [ActivityPub::TagManager.instance.uri_for(object.target_account), '#rejects/follows/', object.id].join - end - - def type - 'Reject' - end - - def actor - ActivityPub::TagManager.instance.uri_for(object.target_account) - end -end diff --git a/app/serializers/activitypub/remove_serializer.rb b/app/serializers/activitypub/remove_serializer.rb deleted file mode 100644 index 7fefda59..00000000 --- a/app/serializers/activitypub/remove_serializer.rb +++ /dev/null @@ -1,24 +0,0 @@ -# frozen_string_literal: true - -class ActivityPub::RemoveSerializer < ActivityPub::Serializer - include RoutingHelper - - attributes :type, :actor, :target - attribute :proper_object, key: :object - - def type - 'Remove' - end - - def actor - ActivityPub::TagManager.instance.uri_for(object.account) - end - - def proper_object - ActivityPub::TagManager.instance.uri_for(object) - end - - def target - account_collection_url(object.account, :featured) - end -end diff --git a/app/serializers/activitypub/undo_announce_serializer.rb b/app/serializers/activitypub/undo_announce_serializer.rb deleted file mode 100644 index 6758af67..00000000 --- a/app/serializers/activitypub/undo_announce_serializer.rb +++ /dev/null @@ -1,23 +0,0 @@ -# frozen_string_literal: true - -class ActivityPub::UndoAnnounceSerializer < ActivityPub::Serializer - attributes :id, :type, :actor, :to - - has_one :object, serializer: ActivityPub::ActivitySerializer - - def id - [ActivityPub::TagManager.instance.uri_for(object.account), '#announces/', object.id, '/undo'].join - end - - def type - 'Undo' - end - - def actor - ActivityPub::TagManager.instance.uri_for(object.account) - end - - def to - [ActivityPub::TagManager::COLLECTIONS[:public]] - end -end diff --git a/app/serializers/activitypub/undo_block_serializer.rb b/app/serializers/activitypub/undo_block_serializer.rb deleted file mode 100644 index b4f04937..00000000 --- a/app/serializers/activitypub/undo_block_serializer.rb +++ /dev/null @@ -1,19 +0,0 @@ -# frozen_string_literal: true - -class ActivityPub::UndoBlockSerializer < ActivityPub::Serializer - attributes :id, :type, :actor - - has_one :object, serializer: ActivityPub::BlockSerializer - - def id - [ActivityPub::TagManager.instance.uri_for(object.account), '#blocks/', object.id, '/undo'].join - end - - def type - 'Undo' - end - - def actor - ActivityPub::TagManager.instance.uri_for(object.account) - end -end diff --git a/app/serializers/activitypub/undo_follow_serializer.rb b/app/serializers/activitypub/undo_follow_serializer.rb deleted file mode 100644 index 9b3e0ca3..00000000 --- a/app/serializers/activitypub/undo_follow_serializer.rb +++ /dev/null @@ -1,19 +0,0 @@ -# frozen_string_literal: true - -class ActivityPub::UndoFollowSerializer < ActivityPub::Serializer - attributes :id, :type, :actor - - has_one :object, serializer: ActivityPub::FollowSerializer - - def id - [ActivityPub::TagManager.instance.uri_for(object.account), '#follows/', object.id, '/undo'].join - end - - def type - 'Undo' - end - - def actor - ActivityPub::TagManager.instance.uri_for(object.account) - end -end diff --git a/app/serializers/activitypub/undo_like_serializer.rb b/app/serializers/activitypub/undo_like_serializer.rb deleted file mode 100644 index 20c786cb..00000000 --- a/app/serializers/activitypub/undo_like_serializer.rb +++ /dev/null @@ -1,19 +0,0 @@ -# frozen_string_literal: true - -class ActivityPub::UndoLikeSerializer < ActivityPub::Serializer - attributes :id, :type, :actor - - has_one :object, serializer: ActivityPub::LikeSerializer - - def id - [ActivityPub::TagManager.instance.uri_for(object.account), '#likes/', object.id, '/undo'].join - end - - def type - 'Undo' - end - - def actor - ActivityPub::TagManager.instance.uri_for(object.account) - end -end diff --git a/app/serializers/activitypub/update_poll_serializer.rb b/app/serializers/activitypub/update_poll_serializer.rb deleted file mode 100644 index b894f309..00000000 --- a/app/serializers/activitypub/update_poll_serializer.rb +++ /dev/null @@ -1,27 +0,0 @@ -# frozen_string_literal: true - -class ActivityPub::UpdatePollSerializer < ActivityPub::Serializer - attributes :id, :type, :actor, :to - - has_one :object, serializer: ActivityPub::NoteSerializer - - def id - [ActivityPub::TagManager.instance.uri_for(object), '#updates/', object.preloadable_poll.updated_at.to_i].join - end - - def type - 'Update' - end - - def actor - ActivityPub::TagManager.instance.uri_for(object) - end - - def to - ActivityPub::TagManager.instance.to(object) - end - - def cc - ActivityPub::TagManager.instance.cc(object) - end -end diff --git a/app/serializers/activitypub/update_serializer.rb b/app/serializers/activitypub/update_serializer.rb deleted file mode 100644 index a5eb857d..00000000 --- a/app/serializers/activitypub/update_serializer.rb +++ /dev/null @@ -1,23 +0,0 @@ -# frozen_string_literal: true - -class ActivityPub::UpdateSerializer < ActivityPub::Serializer - attributes :id, :type, :actor, :to - - has_one :object, serializer: ActivityPub::ActorSerializer - - def id - [ActivityPub::TagManager.instance.uri_for(object), '#updates/', object.updated_at.to_i].join - end - - def type - 'Update' - end - - def actor - ActivityPub::TagManager.instance.uri_for(object) - end - - def to - [ActivityPub::TagManager::COLLECTIONS[:public]] - end -end diff --git a/app/serializers/activitypub/vote_serializer.rb b/app/serializers/activitypub/vote_serializer.rb deleted file mode 100644 index 71ef5c77..00000000 --- a/app/serializers/activitypub/vote_serializer.rb +++ /dev/null @@ -1,52 +0,0 @@ -# frozen_string_literal: true - -class ActivityPub::VoteSerializer < ActivityPub::Serializer - class NoteSerializer < ActivityPub::Serializer - attributes :id, :type, :name, :attributed_to, - :in_reply_to, :to - - def id - ActivityPub::TagManager.instance.uri_for(object) || [ActivityPub::TagManager.instance.uri_for(object.account), '#votes/', object.id].join - end - - def type - 'Note' - end - - def name - object.poll.options[object.choice.to_i] - end - - def attributed_to - ActivityPub::TagManager.instance.uri_for(object.account) - end - - def in_reply_to - ActivityPub::TagManager.instance.uri_for(object.poll.status) - end - - def to - ActivityPub::TagManager.instance.uri_for(object.poll.account) - end - end - - attributes :id, :type, :actor, :to - - has_one :object, serializer: ActivityPub::VoteSerializer::NoteSerializer - - def id - [ActivityPub::TagManager.instance.uri_for(object.account), '#votes/', object.id, '/activity'].join - end - - def type - 'Create' - end - - def actor - ActivityPub::TagManager.instance.uri_for(object.account) - end - - def to - ActivityPub::TagManager.instance.uri_for(object.poll.account) - end -end diff --git a/app/serializers/initial_state_serializer.rb b/app/serializers/initial_state_serializer.rb index 3e828bca..4afb8d77 100644 --- a/app/serializers/initial_state_serializer.rb +++ b/app/serializers/initial_state_serializer.rb @@ -31,7 +31,6 @@ class InitialStateSerializer < ActiveModel::Serializer store[:unread_count] = unread_count object.current_account store[:last_read_notification_id] = object.current_account.user.last_read_notification store[:monthly_expenses_complete] = Redis.current.get("monthly_funding_amount") || 0 - store[:favourites_count] = object.current_account.favourites.count.to_s store[:is_first_session] = is_first_session object.current_account store[:email_confirmed] = object.current_account.user.confirmed? store[:email] = object.current_account.user.confirmed? ? '[hidden]' : object.current_account.user.email @@ -65,7 +64,7 @@ class InitialStateSerializer < ActiveModel::Serializer end private - + def unread_count(account) last_read = account.user.last_read_notification || 0 account.notifications.where("id > #{last_read}").count diff --git a/app/serializers/oembed_serializer.rb b/app/serializers/oembed_serializer.rb index 4019076e..00ee0ef9 100644 --- a/app/serializers/oembed_serializer.rb +++ b/app/serializers/oembed_serializer.rb @@ -4,8 +4,8 @@ class OEmbedSerializer < ActiveModel::Serializer include RoutingHelper include ActionView::Helpers::TagHelper - attributes :type, :version, :title, :author_name, - :author_url, :provider_name, :provider_url, + attributes :type, :version, :title + :provider_name, :provider_url, :cache_age, :html, :width, :height def type @@ -16,14 +16,6 @@ class OEmbedSerializer < ActiveModel::Serializer '1.0' end - def author_name - object.account.display_name.presence || object.account.username - end - - def author_url - short_account_url(object.account) - end - def provider_name Rails.configuration.x.local_domain end diff --git a/app/serializers/rest/account_serializer.rb b/app/serializers/rest/account_serializer.rb index 2b23e33c..640538d3 100644 --- a/app/serializers/rest/account_serializer.rb +++ b/app/serializers/rest/account_serializer.rb @@ -33,34 +33,18 @@ class REST::AccountSerializer < ActiveModel::Serializer end def avatar - if object.avatar_file_name.nil? and object.avatar_remote_url and object.avatar_remote_url.start_with? "gab://avatar/" - return object.avatar_remote_url.sub("gab://avatar/", "https://gab.com/media/user/") - end - full_asset_url(object.avatar_original_url) end def avatar_static - if object.avatar_file_name.nil? and object.avatar_remote_url and object.avatar_remote_url.start_with? "gab://avatar/" - return object.avatar_remote_url.sub("gab://avatar/", "https://gab.com/media/user/") - end - full_asset_url(object.avatar_static_url) end def header - if object.header_file_name.nil? and object.header_remote_url and object.header_remote_url.start_with? "gab://header/" - return object.header_remote_url.sub("gab://header/", "https://gab.com/media/user/") - end - full_asset_url(object.header_original_url) end def header_static - if object.header_file_name.nil? and object.header_remote_url and object.header_remote_url.start_with? "gab://header/" - return object.header_remote_url.sub("gab://header/", "https://gab.com/media/user/") - end - full_asset_url(object.header_static_url) end diff --git a/app/serializers/rest/group_serializer.rb b/app/serializers/rest/group_serializer.rb index 4f078cfd..f443ff32 100644 --- a/app/serializers/rest/group_serializer.rb +++ b/app/serializers/rest/group_serializer.rb @@ -3,9 +3,10 @@ class REST::GroupSerializer < ActiveModel::Serializer include RoutingHelper - attributes :id, :title, :description, :description_html, :cover_image_url, :is_archived, - :member_count, :created_at, :is_private, :is_visible, :slug, :tags, :group_category, :password, - :has_password + attributes :id, :title, :description, :description_html, + :cover_image_url, :is_archived, :member_count, + :created_at, :is_private, :is_visible, :slug, + :tags, :group_category, :password, :has_password def id object.id.to_s diff --git a/app/serializers/rest/identity_proof_serializer.rb b/app/serializers/rest/identity_proof_serializer.rb deleted file mode 100644 index 0e741593..00000000 --- a/app/serializers/rest/identity_proof_serializer.rb +++ /dev/null @@ -1,17 +0,0 @@ -# frozen_string_literal: true - -class REST::IdentityProofSerializer < ActiveModel::Serializer - attributes :provider, :provider_username, :updated_at, :proof_url, :profile_url - - def proof_url - object.badge.proof_url - end - - def profile_url - object.badge.profile_url - end - - def provider - object.provider.capitalize - end -end diff --git a/app/serializers/rest/instance_serializer.rb b/app/serializers/rest/instance_serializer.rb deleted file mode 100644 index bd56c904..00000000 --- a/app/serializers/rest/instance_serializer.rb +++ /dev/null @@ -1,63 +0,0 @@ -# frozen_string_literal: true - -class REST::InstanceSerializer < ActiveModel::Serializer - include RoutingHelper - - attributes :uri, :title, :description, :email, - :version, :urls, :stats, :thumbnail, - :languages, :registrations - - has_one :contact_account, serializer: REST::AccountSerializer - - delegate :contact_account, to: :instance_presenter - - def uri - Rails.configuration.x.local_domain - end - - def title - Setting::SITE_TITLE - end - - def description - Setting.site_description - end - - def email - Setting.site_contact_email - end - - def version - GabSocial::Version.to_s - end - - def thumbnail - instance_presenter.thumbnail ? full_asset_url(instance_presenter.thumbnail.file.url) : full_pack_url('media/images/preview.png') - end - - def stats - { - user_count: instance_presenter.user_count, - status_count: instance_presenter.status_count, - domain_count: instance_presenter.domain_count, - } - end - - def urls - { streaming_api: Rails.configuration.x.streaming_api_base_url } - end - - def languages - [I18n.default_locale] - end - - def registrations - Setting.registrations_mode != 'none' && !Rails.configuration.x.single_user_mode - end - - private - - def instance_presenter - @instance_presenter ||= InstancePresenter.new - end -end diff --git a/app/serializers/rest/preview_card_serializer.rb b/app/serializers/rest/preview_card_serializer.rb index 9d0d0db2..102778e4 100644 --- a/app/serializers/rest/preview_card_serializer.rb +++ b/app/serializers/rest/preview_card_serializer.rb @@ -4,9 +4,8 @@ class REST::PreviewCardSerializer < ActiveModel::Serializer include RoutingHelper attributes :id, :url, :title, :description, :type, - :author_name, :author_url, :provider_name, - :provider_url, :html, :width, :height, - :image, :embed_url, :updated_at + :provider_name, :provider_url, :html, + :width, :height, :image, :embed_url, :updated_at def image object.image? ? full_asset_url(object.image.url(:original)) : nil diff --git a/app/serializers/rest/relationship_serializer.rb b/app/serializers/rest/relationship_serializer.rb index 1a3fd915..38dad53d 100644 --- a/app/serializers/rest/relationship_serializer.rb +++ b/app/serializers/rest/relationship_serializer.rb @@ -1,9 +1,8 @@ # frozen_string_literal: true class REST::RelationshipSerializer < ActiveModel::Serializer - attributes :id, :following, :showing_reblogs, :followed_by, :blocking, :blocked_by, - :muting, :muting_notifications, :requested, :domain_blocking, - :endorsed + attributes :id, :following, :showing_reblogs, :followed_by, :blocking, + :blocked_by, :muting, :muting_notifications, :requested def id object.id.to_s @@ -42,12 +41,4 @@ class REST::RelationshipSerializer < ActiveModel::Serializer def requested instance_options[:relationships].requested[object.id] ? true : false end - - def domain_blocking - instance_options[:relationships].domain_blocking[object.id] || false - end - - def endorsed - instance_options[:relationships].endorsed[object.id] || false - end end diff --git a/app/serializers/rest/search_serializer.rb b/app/serializers/rest/search_serializer.rb index f82cbd89..a8897f1b 100644 --- a/app/serializers/rest/search_serializer.rb +++ b/app/serializers/rest/search_serializer.rb @@ -1,14 +1,10 @@ # frozen_string_literal: true class REST::SearchSerializer < ActiveModel::Serializer - attributes :hashtags has_many :accounts, serializer: REST::AccountSerializer has_many :statuses, serializer: REST::StatusSerializer has_many :groups, serializer: REST::GroupSerializer has_many :links, serializer: REST::PreviewCardSerializer - def hashtags - object.hashtags.map(&:name) - end end diff --git a/app/serializers/rest/status_bookmarked_serializer.rb b/app/serializers/rest/status_bookmarked_serializer.rb new file mode 100644 index 00000000..e69de29b diff --git a/app/serializers/rest/status_group_pinned_serializer.rb b/app/serializers/rest/status_group_pinned_serializer.rb new file mode 100644 index 00000000..e69de29b diff --git a/app/serializers/rest/status_pinned_serializer.rb b/app/serializers/rest/status_pinned_serializer.rb new file mode 100644 index 00000000..e69de29b diff --git a/app/serializers/rest/status_serializer.rb b/app/serializers/rest/status_serializer.rb index b8aed7e4..c99a91ec 100644 --- a/app/serializers/rest/status_serializer.rb +++ b/app/serializers/rest/status_serializer.rb @@ -3,15 +3,15 @@ class REST::StatusSerializer < ActiveModel::Serializer attributes :id, :created_at, :revised_at, :in_reply_to_id, :in_reply_to_account_id, :sensitive, :spoiler_text, :visibility, :language, - :uri, :url, :replies_count, :reblogs_count, + :url, :replies_count, :reblogs_count, :favourites_count, :quote_of_id, :expires_at, :has_quote attribute :favourited, if: :current_user? attribute :reblogged, if: :current_user? - attribute :muted, if: :current_user? - attribute :bookmarked, if: :current_user? - attribute :pinned, if: :pinnable? - attribute :pinned_by_group, if: :pinnable_by_group? + + attribute :account_id, if: :account_id? + attribute :group_id, if: :group_id? + attribute :preview_card_id, if: :preview_card_id? attribute :content, unless: :source_requested? attribute :rich_content, unless: :source_requested? @@ -20,16 +20,15 @@ class REST::StatusSerializer < ActiveModel::Serializer belongs_to :reblog, serializer: REST::StatusSerializer belongs_to :quote, serializer: REST::StatusSerializer - belongs_to :application, if: :show_application? - belongs_to :account, serializer: REST::AccountSerializer - belongs_to :group, serializer: REST::GroupSerializer + belongs_to :account, serializer: REST::AccountSerializer, unless: :account_id? + belongs_to :group, serializer: REST::GroupSerializer, unless: :group_id? has_many :media_attachments, serializer: REST::MediaAttachmentSerializer has_many :ordered_mentions, key: :mentions has_many :tags has_many :emojis, serializer: REST::CustomEmojiSerializer - has_one :preview_card, key: :card, serializer: REST::PreviewCardSerializer + has_one :preview_card, key: :card, serializer: REST::PreviewCardSerializer, unless: :preview_card_id? has_one :preloadable_poll, key: :poll, serializer: REST::PollSerializer def id @@ -52,8 +51,28 @@ class REST::StatusSerializer < ActiveModel::Serializer !current_user.nil? end - def show_application? - object.account.user_shows_application? || (current_user? && current_user.account_id == object.account_id) + def account_id + instance_options[:account_id] + end + + def account_id? + !instance_options[:account_id].nil? + end + + def group_id + instance_options[:group_id] + end + + def group_id? + !instance_options[:group_id].nil? + end + + def preview_card_id + instance_options[:preview_card_id] + end + + def preview_card_id? + !instance_options[:preview_card_id].nil? end def visibility @@ -68,7 +87,10 @@ class REST::StatusSerializer < ActiveModel::Serializer end def uri - OStatus::TagManager.instance.uri_for(object) + "/#{object.account.username}/posts/#{object.id}" + # uri: "https://gab.com/users/a/statuses/105075286733432550" + # url: "https://gab.com/a/posts/105075286733432550" + # TagManager.instance.uri_for(object) end def content @@ -111,14 +133,6 @@ class REST::StatusSerializer < ActiveModel::Serializer end end - def muted - if instance_options && instance_options[:relationships] - instance_options[:relationships].mutes_map[object.conversation_id] || false - else - current_user.account.muting_conversation?(object.conversation) - end - end - def bookmarked if instance_options && instance_options[:relationships] instance_options[:relationships].bookmarks_map[object.id] || false @@ -196,7 +210,7 @@ class REST::StatusSerializer < ActiveModel::Serializer attributes :name, :url def url - tag_url(object) + "/tags/#{object.name}" end end end diff --git a/app/serializers/rest/status_stat_serializer.rb b/app/serializers/rest/status_stat_serializer.rb new file mode 100644 index 00000000..0cef5699 --- /dev/null +++ b/app/serializers/rest/status_stat_serializer.rb @@ -0,0 +1,41 @@ +# frozen_string_literal: true + +class REST::StatusStatSerializer < ActiveModel::Serializer + attributes :status_id, :replies_count, :reblogs_count, :favourites_count + + attribute :favourited, if: :current_user? + attribute :reblogged, if: :current_user? + + def status_id + object.id.to_s + end + + def favourited + if instance_options && instance_options[:relationships] + instance_options[:relationships].favourites_map[object.id] || false + else + current_user.account.favourited?(object) + end + end + + def favourites_count + if instance_options && instance_options[:unfavourite] + object.favourites_count - 1 + else + object.favourites_count + end + end + + def reblogged + if instance_options && instance_options[:relationships] + instance_options[:relationships].reblogs_map[object.id] || false + else + current_user.account.reblogged?(object) + end + end + + def current_user? + !current_user.nil? + end + +end diff --git a/app/serializers/rest/tag_serializer.rb b/app/serializers/rest/tag_serializer.rb index 74aa571a..6b919673 100644 --- a/app/serializers/rest/tag_serializer.rb +++ b/app/serializers/rest/tag_serializer.rb @@ -6,6 +6,6 @@ class REST::TagSerializer < ActiveModel::Serializer attributes :name, :url, :history def url - tag_url(object) + "/tags/#{object.name}" end end diff --git a/app/serializers/rest/v2/search_serializer.rb b/app/serializers/rest/v2/search_serializer.rb index 14fa6be0..1299de7b 100644 --- a/app/serializers/rest/v2/search_serializer.rb +++ b/app/serializers/rest/v2/search_serializer.rb @@ -3,7 +3,6 @@ class REST::V2::SearchSerializer < ActiveModel::Serializer has_many :accounts, serializer: REST::AccountSerializer has_many :statuses, serializer: REST::StatusSerializer - has_many :hashtags, serializer: REST::TagSerializer has_many :groups, serializer: REST::GroupSerializer has_many :links, serializer: REST::PreviewCardSerializer end diff --git a/app/serializers/rss/account_serializer.rb b/app/serializers/rss/account_serializer.rb deleted file mode 100644 index 361b288c..00000000 --- a/app/serializers/rss/account_serializer.rb +++ /dev/null @@ -1,39 +0,0 @@ -# frozen_string_literal: true - -class RSS::AccountSerializer - include ActionView::Helpers::NumberHelper - include StreamEntriesHelper - include RoutingHelper - - def render(account, statuses) - builder = RSSBuilder.new - - builder.title("#{display_name(account)} (@#{account.local_username_and_domain})") - .description(account_description(account)) - .link(TagManager.instance.url_for(account)) - .logo(full_pack_url('media/images/logo.png')) - .accent_color('2b90d9') - - builder.image(full_asset_url(account.avatar.url(:original))) if account.avatar? - builder.cover(full_asset_url(account.header.url(:original))) if account.header? - - statuses.each do |status| - builder.item do |item| - item.title(status.title) - .link(TagManager.instance.url_for(status)) - .pub_date(status.created_at) - .description(status.spoiler_text.presence || Formatter.instance.plaintext(status).to_str) - - status.media_attachments.each do |media| - item.enclosure(full_asset_url(media.file.url(:original, false)), media.file.content_type, length: media.file.size) - end - end - end - - builder.to_xml - end - - def self.render(account, statuses) - new.render(account, statuses) - end -end diff --git a/app/serializers/rss/tag_serializer.rb b/app/serializers/rss/tag_serializer.rb deleted file mode 100644 index dc07a837..00000000 --- a/app/serializers/rss/tag_serializer.rb +++ /dev/null @@ -1,37 +0,0 @@ -# frozen_string_literal: true - -class RSS::TagSerializer - include ActionView::Helpers::NumberHelper - include ActionView::Helpers::SanitizeHelper - include StreamEntriesHelper - include RoutingHelper - - def render(tag, statuses) - builder = RSSBuilder.new - - builder.title("##{tag.name}") - .description(strip_tags(I18n.t('about.about_hashtag_html', hashtag: tag.name))) - .link(tag_url(tag)) - .logo(full_pack_url('media/images/logo.png')) - .accent_color('2b90d9') - - statuses.each do |status| - builder.item do |item| - item.title(status.title) - .link(TagManager.instance.url_for(status)) - .pub_date(status.created_at) - .description(status.spoiler_text.presence || Formatter.instance.plaintext(status).to_str) - - status.media_attachments.each do |media| - item.enclosure(full_asset_url(media.file.url(:original, false)), media.file.content_type, length: media.file.size) - end - end - end - - builder.to_xml - end - - def self.render(tag, statuses) - new.render(tag, statuses) - end -end diff --git a/app/serializers/webfinger_serializer.rb b/app/serializers/webfinger_serializer.rb deleted file mode 100644 index 4220f697..00000000 --- a/app/serializers/webfinger_serializer.rb +++ /dev/null @@ -1,25 +0,0 @@ -# frozen_string_literal: true - -class WebfingerSerializer < ActiveModel::Serializer - include RoutingHelper - - attributes :subject, :aliases, :links - - def subject - object.to_webfinger_s - end - - def aliases - [short_account_url(object), account_url(object)] - end - - def links - [ - { rel: 'http://webfinger.net/rel/profile-page', type: 'text/html', href: short_account_url(object) }, - { rel: 'http://schemas.google.com/g/2010#updates-from', type: 'application/atom+xml', href: account_url(object, format: 'atom') }, - { rel: 'self', type: 'application/activity+json', href: account_url(object) }, - { rel: 'magic-public-key', href: "data:application/magic-public-key,#{object.magic_key}" }, - { rel: 'http://ostatus.org/schema/1.0/subscribe', template: "#{authorize_interaction_url}?uri={uri}" }, - ] - end -end diff --git a/app/services/account_search_service.rb b/app/services/account_search_service.rb index b1d77357..9c6b63c9 100644 --- a/app/services/account_search_service.rb +++ b/app/services/account_search_service.rb @@ -68,8 +68,6 @@ class AccountSearchService < BaseService @_exact_match ||= begin if domain_is_local? search_from.without_suspended.find_local(query_username) - else - search_from.without_suspended.find_remote(query_username, query_domain) end end end diff --git a/app/services/activitypub/fetch_featured_collection_service.rb b/app/services/activitypub/fetch_featured_collection_service.rb deleted file mode 100644 index 6a137b52..00000000 --- a/app/services/activitypub/fetch_featured_collection_service.rb +++ /dev/null @@ -1,54 +0,0 @@ -# frozen_string_literal: true - -class ActivityPub::FetchFeaturedCollectionService < BaseService - include JsonLdHelper - - def call(account) - return if account.featured_collection_url.blank? - - @account = account - @json = fetch_resource(@account.featured_collection_url, true) - - return unless supported_context? - return if @account.suspended? || @account.local? - - case @json['type'] - when 'Collection', 'CollectionPage' - process_items @json['items'] - when 'OrderedCollection', 'OrderedCollectionPage' - process_items @json['orderedItems'] - end - end - - private - - def process_items(items) - status_ids = items.map { |item| value_or_id(item) } - .reject { |uri| ActivityPub::TagManager.instance.local_uri?(uri) } - .map { |uri| ActivityPub::FetchRemoteStatusService.new.call(uri) } - .compact - .select { |status| status.account_id == @account.id } - .map(&:id) - - to_remove = [] - to_add = status_ids - - StatusPin.where(account: @account).pluck(:status_id).each do |status_id| - if status_ids.include?(status_id) - to_add.delete(status_id) - else - to_remove << status_id - end - end - - StatusPin.where(account: @account, status_id: to_remove).delete_all unless to_remove.empty? - - to_add.each do |status_id| - StatusPin.create!(account: @account, status_id: status_id) - end - end - - def supported_context? - super(@json) - end -end diff --git a/app/services/activitypub/fetch_remote_account_service.rb b/app/services/activitypub/fetch_remote_account_service.rb deleted file mode 100644 index 3c204494..00000000 --- a/app/services/activitypub/fetch_remote_account_service.rb +++ /dev/null @@ -1,62 +0,0 @@ -# frozen_string_literal: true - -class ActivityPub::FetchRemoteAccountService < BaseService - include JsonLdHelper - - SUPPORTED_TYPES = %w(Application Group Organization Person Service).freeze - - # Does a WebFinger roundtrip on each call, unless `only_key` is true - def call(uri, id: true, prefetched_body: nil, break_on_redirect: false, only_key: false) - return ActivityPub::TagManager.instance.uri_to_resource(uri, Account) if ActivityPub::TagManager.instance.local_uri?(uri) - - @json = if prefetched_body.nil? - fetch_resource(uri, id) - else - body_to_json(prefetched_body, compare_id: id ? uri : nil) - end - - return if !supported_context? || !expected_type? || (break_on_redirect && @json['movedTo'].present?) - - @uri = @json['id'] - @username = @json['preferredUsername'] - @domain = Addressable::URI.parse(@uri).normalized_host - - return unless only_key || verified_webfinger? - - ActivityPub::ProcessAccountService.new.call(@username, @domain, @json, only_key: only_key) - rescue Oj::ParseError - nil - end - - private - - def verified_webfinger? - webfinger = Goldfinger.finger("acct:#{@username}@#{@domain}") - confirmed_username, confirmed_domain = split_acct(webfinger.subject) - - return webfinger.link('self')&.href == @uri if @username.casecmp(confirmed_username).zero? && @domain.casecmp(confirmed_domain).zero? - - webfinger = Goldfinger.finger("acct:#{confirmed_username}@#{confirmed_domain}") - @username, @domain = split_acct(webfinger.subject) - self_reference = webfinger.link('self') - - return false unless @username.casecmp(confirmed_username).zero? && @domain.casecmp(confirmed_domain).zero? - return false if self_reference&.href != @uri - - true - rescue Goldfinger::Error - false - end - - def split_acct(acct) - acct.gsub(/\Aacct:/, '').split('@') - end - - def supported_context? - super(@json) - end - - def expected_type? - equals_or_includes_any?(@json['type'], SUPPORTED_TYPES) - end -end diff --git a/app/services/activitypub/fetch_remote_key_service.rb b/app/services/activitypub/fetch_remote_key_service.rb deleted file mode 100644 index df17d907..00000000 --- a/app/services/activitypub/fetch_remote_key_service.rb +++ /dev/null @@ -1,60 +0,0 @@ -# frozen_string_literal: true - -class ActivityPub::FetchRemoteKeyService < BaseService - include JsonLdHelper - - # Returns account that owns the key - def call(uri, id: true, prefetched_body: nil) - if prefetched_body.nil? - if id - @json = fetch_resource_without_id_validation(uri) - if person? - @json = fetch_resource(@json['id'], true) - elsif uri != @json['id'] - return - end - else - @json = fetch_resource(uri, id) - end - else - @json = body_to_json(prefetched_body, compare_id: id ? uri : nil) - end - - return unless supported_context?(@json) && expected_type? - return find_account(@json['id'], @json) if person? - - @owner = fetch_resource(owner_uri, true) - - return unless supported_context?(@owner) && confirmed_owner? - - find_account(owner_uri, @owner) - end - - private - - def find_account(uri, prefetched_body) - account = ActivityPub::TagManager.instance.uri_to_resource(uri, Account) - account ||= ActivityPub::FetchRemoteAccountService.new.call(uri, prefetched_body: prefetched_body) - account - end - - def expected_type? - person? || public_key? - end - - def person? - equals_or_includes_any?(@json['type'], ActivityPub::FetchRemoteAccountService::SUPPORTED_TYPES) - end - - def public_key? - @json['publicKeyPem'].present? && @json['owner'].present? - end - - def owner_uri - @owner_uri ||= value_or_id(@json['owner']) - end - - def confirmed_owner? - equals_or_includes_any?(@owner['type'], ActivityPub::FetchRemoteAccountService::SUPPORTED_TYPES) && value_or_id(@owner['publicKey']) == @json['id'] - end -end diff --git a/app/services/activitypub/fetch_remote_poll_service.rb b/app/services/activitypub/fetch_remote_poll_service.rb deleted file mode 100644 index 854a32d0..00000000 --- a/app/services/activitypub/fetch_remote_poll_service.rb +++ /dev/null @@ -1,11 +0,0 @@ -# frozen_string_literal: true - -class ActivityPub::FetchRemotePollService < BaseService - include JsonLdHelper - - def call(poll, on_behalf_of = nil) - json = fetch_resource(poll.status.uri, true, on_behalf_of) - return unless supported_context?(json) - ActivityPub::ProcessPollService.new.call(poll, json) - end -end diff --git a/app/services/activitypub/fetch_remote_status_service.rb b/app/services/activitypub/fetch_remote_status_service.rb deleted file mode 100644 index 46982103..00000000 --- a/app/services/activitypub/fetch_remote_status_service.rb +++ /dev/null @@ -1,52 +0,0 @@ -# frozen_string_literal: true - -class ActivityPub::FetchRemoteStatusService < BaseService - include JsonLdHelper - - # Should be called when uri has already been checked for locality - def call(uri, id: true, prefetched_body: nil, on_behalf_of: nil) - @json = if prefetched_body.nil? - fetch_resource(uri, id, on_behalf_of) - else - body_to_json(prefetched_body, compare_id: id ? uri : nil) - end - - return unless supported_context? && expected_type? - - return if actor_id.nil? || !trustworthy_attribution?(@json['id'], actor_id) - - actor = ActivityPub::TagManager.instance.uri_to_resource(actor_id, Account) - actor = ActivityPub::FetchRemoteAccountService.new.call(actor_id, id: true) if actor.nil? || needs_update(actor) - - return if actor.nil? || actor.suspended? - - ActivityPub::Activity.factory(activity_json, actor).perform - end - - private - - def activity_json - { 'type' => 'Create', 'actor' => actor_id, 'object' => @json } - end - - def actor_id - value_or_id(first_of_value(@json['attributedTo'])) - end - - def trustworthy_attribution?(uri, attributed_to) - return false if uri.nil? || attributed_to.nil? - Addressable::URI.parse(uri).normalized_host.casecmp(Addressable::URI.parse(attributed_to).normalized_host).zero? - end - - def supported_context? - super(@json) - end - - def expected_type? - equals_or_includes_any?(@json['type'], ActivityPub::Activity::Create::SUPPORTED_TYPES + ActivityPub::Activity::Create::CONVERTED_TYPES) - end - - def needs_update(actor) - actor.possibly_stale? - end -end diff --git a/app/services/activitypub/fetch_replies_service.rb b/app/services/activitypub/fetch_replies_service.rb deleted file mode 100644 index 8cb309e5..00000000 --- a/app/services/activitypub/fetch_replies_service.rb +++ /dev/null @@ -1,49 +0,0 @@ -# frozen_string_literal: true - -class ActivityPub::FetchRepliesService < BaseService - include JsonLdHelper - - def call(parent_status, collection_or_uri, allow_synchronous_requests = true) - @account = parent_status.account - @allow_synchronous_requests = allow_synchronous_requests - - @items = collection_items(collection_or_uri) - return if @items.nil? - - FetchReplyWorker.push_bulk(filtered_replies) - - @items - end - - private - - def collection_items(collection_or_uri) - collection = fetch_collection(collection_or_uri) - return unless collection.is_a?(Hash) - - collection = fetch_collection(collection['first']) if collection['first'].present? - return unless collection.is_a?(Hash) - - case collection['type'] - when 'Collection', 'CollectionPage' - collection['items'] - when 'OrderedCollection', 'OrderedCollectionPage' - collection['orderedItems'] - end - end - - def fetch_collection(collection_or_uri) - return collection_or_uri if collection_or_uri.is_a?(Hash) - return unless @allow_synchronous_requests - return if invalid_origin?(collection_or_uri) - fetch_resource_without_id_validation(collection_or_uri, nil, true) - end - - def filtered_replies - # Only fetch replies to the same server as the original status to avoid - # amplification attacks. - - # Also limit to 5 fetched replies to limit potential for DoS. - @items.map { |item| value_or_id(item) }.reject { |uri| invalid_origin?(uri) }.take(5) - end -end diff --git a/app/services/activitypub/process_account_service.rb b/app/services/activitypub/process_account_service.rb deleted file mode 100644 index f595708a..00000000 --- a/app/services/activitypub/process_account_service.rb +++ /dev/null @@ -1,276 +0,0 @@ -# frozen_string_literal: true - -class ActivityPub::ProcessAccountService < BaseService - include JsonLdHelper - - # Should be called with confirmed valid JSON - # and WebFinger-resolved username and domain - def call(username, domain, json, options = {}) - return if json['inbox'].blank? || unsupported_uri_scheme?(json['id']) - - @options = options - @json = json - @uri = @json['id'] - @username = username - @domain = domain - @collections = {} - - RedisLock.acquire(lock_options) do |lock| - if lock.acquired? - @account = Account.find_remote(@username, @domain) - @old_public_key = @account&.public_key - @old_protocol = @account&.protocol - - create_account if @account.nil? - update_account - process_tags - process_attachments - else - raise GabSocial::RaceConditionError - end - end - - return if @account.nil? - - after_protocol_change! if protocol_changed? - after_key_change! if key_changed? && !@options[:signed_with_known_key] - clear_tombstones! if key_changed? - - unless @options[:only_key] - check_featured_collection! if @account.featured_collection_url.present? - check_links! unless @account.fields.empty? - end - - @account - rescue Oj::ParseError - nil - end - - private - - def create_account - @account = Account.new - @account.protocol = :activitypub - @account.username = @username - @account.domain = @domain - @account.private_key = nil - @account.suspended_at = domain_block.created_at if auto_suspend? - @account.silenced_at = domain_block.created_at if auto_silence? - end - - def update_account - @account.last_webfingered_at = Time.now.utc unless @options[:only_key] - @account.protocol = :activitypub - - set_immediate_attributes! - set_fetchable_attributes! unless @options[:only_keys] - - @account.save_with_optional_media! - end - - def set_immediate_attributes! - @account.inbox_url = @json['inbox'] || '' - @account.outbox_url = @json['outbox'] || '' - @account.shared_inbox_url = (@json['endpoints'].is_a?(Hash) ? @json['endpoints']['sharedInbox'] : @json['sharedInbox']) || '' - @account.followers_url = @json['followers'] || '' - @account.featured_collection_url = @json['featured'] || '' - @account.url = url || @uri - @account.uri = @uri - @account.display_name = @json['name'] || '' - @account.note = @json['summary'] || '' - @account.locked = @json['manuallyApprovesFollowers'] || false - @account.fields = property_values || {} - @account.also_known_as = as_array(@json['alsoKnownAs'] || []).map { |item| value_or_id(item) } - @account.actor_type = actor_type - end - - def set_fetchable_attributes! - @account.avatar_remote_url = image_url('icon') unless skip_download? - @account.header_remote_url = image_url('image') unless skip_download? - @account.public_key = public_key || '' - @account.statuses_count = outbox_total_items if outbox_total_items.present? - @account.following_count = following_total_items if following_total_items.present? - @account.followers_count = followers_total_items if followers_total_items.present? - @account.moved_to_account = @json['movedTo'].present? ? moved_account : nil - end - - def after_protocol_change! - ActivityPub::PostUpgradeWorker.perform_async(@account.domain) - end - - def after_key_change! - RefollowWorker.perform_async(@account.id) - end - - def check_featured_collection! - ActivityPub::SynchronizeFeaturedCollectionWorker.perform_async(@account.id) - end - - def check_links! - VerifyAccountLinksWorker.perform_async(@account.id) - end - - def actor_type - if @json['type'].is_a?(Array) - @json['type'].find { |type| ActivityPub::FetchRemoteAccountService::SUPPORTED_TYPES.include?(type) } - else - @json['type'] - end - end - - def image_url(key) - value = first_of_value(@json[key]) - - return if value.nil? - return value['url'] if value.is_a?(Hash) - - image = fetch_resource_without_id_validation(value) - image['url'] if image - end - - def public_key - value = first_of_value(@json['publicKey']) - - return if value.nil? - return value['publicKeyPem'] if value.is_a?(Hash) - - key = fetch_resource_without_id_validation(value) - key['publicKeyPem'] if key - end - - def url - return if @json['url'].blank? - - url_candidate = url_to_href(@json['url'], 'text/html') - - if unsupported_uri_scheme?(url_candidate) || mismatching_origin?(url_candidate) - nil - else - url_candidate - end - end - - def property_values - return unless @json['attachment'].is_a?(Array) - as_array(@json['attachment']).select { |attachment| attachment['type'] == 'PropertyValue' }.map { |attachment| attachment.slice('name', 'value') } - end - - def mismatching_origin?(url) - needle = Addressable::URI.parse(url).host - haystack = Addressable::URI.parse(@uri).host - - !haystack.casecmp(needle).zero? - end - - def outbox_total_items - collection_total_items('outbox') - end - - def following_total_items - collection_total_items('following') - end - - def followers_total_items - collection_total_items('followers') - end - - def collection_total_items(type) - return if @json[type].blank? - return @collections[type] if @collections.key?(type) - - collection = fetch_resource_without_id_validation(@json[type]) - - @collections[type] = collection.is_a?(Hash) && collection['totalItems'].present? && collection['totalItems'].is_a?(Numeric) ? collection['totalItems'] : nil - rescue HTTP::Error, OpenSSL::SSL::SSLError - @collections[type] = nil - end - - def moved_account - account = ActivityPub::TagManager.instance.uri_to_resource(@json['movedTo'], Account) - account ||= ActivityPub::FetchRemoteAccountService.new.call(@json['movedTo'], id: true, break_on_redirect: true) - account - end - - def skip_download? - @account.suspended? || domain_block&.reject_media? - end - - def auto_suspend? - domain_block&.suspend? - end - - def auto_silence? - domain_block&.silence? - end - - def domain_block - return @domain_block if defined?(@domain_block) - @domain_block = DomainBlock.find_by(domain: @domain) - end - - def key_changed? - !@old_public_key.nil? && @old_public_key != @account.public_key - end - - def clear_tombstones! - Tombstone.where(account_id: @account.id).delete_all - end - - def protocol_changed? - !@old_protocol.nil? && @old_protocol != @account.protocol - end - - def lock_options - { redis: Redis.current, key: "process_account:#{@uri}" } - end - - def process_tags - return if @json['tag'].blank? - - as_array(@json['tag']).each do |tag| - process_emoji tag if equals_or_includes?(tag['type'], 'Emoji') - end - end - - def process_attachments - return if @json['attachment'].blank? - - previous_proofs = @account.identity_proofs.to_a - current_proofs = [] - - as_array(@json['attachment']).each do |attachment| - next unless equals_or_includes?(attachment['type'], 'IdentityProof') - current_proofs << process_identity_proof(attachment) - end - - previous_proofs.each do |previous_proof| - next if current_proofs.any? { |current_proof| current_proof.id == previous_proof.id } - previous_proof.delete - end - end - - def process_emoji(tag) - return if skip_download? - return if tag['name'].blank? || tag['icon'].blank? || tag['icon']['url'].blank? - - shortcode = tag['name'].delete(':') - image_url = tag['icon']['url'] - uri = tag['id'] - updated = tag['updated'] - emoji = CustomEmoji.find_by(shortcode: shortcode, domain: @account.domain) - - return unless emoji.nil? || image_url != emoji.image_remote_url || (updated && updated >= emoji.updated_at) - - emoji ||= CustomEmoji.new(domain: @account.domain, shortcode: shortcode, uri: uri) - emoji.image_remote_url = image_url - emoji.save - end - - def process_identity_proof(attachment) - provider = attachment['signatureAlgorithm'] - provider_username = attachment['name'] - token = attachment['signatureValue'] - - @account.identity_proofs.where(provider: provider, provider_username: provider_username).find_or_create_by(provider: provider, provider_username: provider_username, token: token) - end -end diff --git a/app/services/activitypub/process_collection_service.rb b/app/services/activitypub/process_collection_service.rb deleted file mode 100644 index 881df478..00000000 --- a/app/services/activitypub/process_collection_service.rb +++ /dev/null @@ -1,53 +0,0 @@ -# frozen_string_literal: true - -class ActivityPub::ProcessCollectionService < BaseService - include JsonLdHelper - - def call(body, account, **options) - @account = account - @json = Oj.load(body, mode: :strict) - @options = options - - return unless supported_context? - return if different_actor? && verify_account!.nil? - return if @account.suspended? || @account.local? - - case @json['type'] - when 'Collection', 'CollectionPage' - process_items @json['items'] - when 'OrderedCollection', 'OrderedCollectionPage' - process_items @json['orderedItems'] - else - process_items [@json] - end - rescue Oj::ParseError - nil - end - - private - - def different_actor? - @json['actor'].present? && value_or_id(@json['actor']) != @account.uri - end - - def process_items(items) - items.reverse_each.map { |item| process_item(item) }.compact - end - - def supported_context? - super(@json) - end - - def process_item(item) - activity = ActivityPub::Activity.factory(item, @account, @options) - activity&.perform - end - - def verify_account! - @options[:relayed_through_account] = @account - @account = ActivityPub::LinkedDataSignature.new(@json).verify_account! - rescue JSON::LD::JsonLdError => e - Rails.logger.debug "Could not verify LD-Signature for #{value_or_id(@json['actor'])}: #{e.message}" - nil - end -end diff --git a/app/services/activitypub/process_poll_service.rb b/app/services/activitypub/process_poll_service.rb deleted file mode 100644 index 61357abd..00000000 --- a/app/services/activitypub/process_poll_service.rb +++ /dev/null @@ -1,60 +0,0 @@ -# frozen_string_literal: true - -class ActivityPub::ProcessPollService < BaseService - include JsonLdHelper - - def call(poll, json) - @json = json - return unless expected_type? - - previous_expires_at = poll.expires_at - - expires_at = begin - if @json['closed'].is_a?(String) - @json['closed'] - elsif !@json['closed'].nil? && !@json['closed'].is_a?(FalseClass) - Time.now.utc - else - @json['endTime'] - end - end - - items = begin - if @json['anyOf'].is_a?(Array) - @json['anyOf'] - else - @json['oneOf'] - end - end - - latest_options = items.map { |item| item['name'].presence || item['content'] } - - # If for some reasons the options were changed, it invalidates all previous - # votes, so we need to remove them - poll.votes.delete_all if latest_options != poll.options - - begin - poll.update!( - last_fetched_at: Time.now.utc, - expires_at: expires_at, - options: latest_options, - cached_tallies: items.map { |item| item.dig('replies', 'totalItems') || 0 } - ) - rescue ActiveRecord::StaleObjectError - poll.reload - retry - end - - # If the poll had no expiration date set but now has, and people have voted, - # schedule a notification. - if previous_expires_at.nil? && poll.expires_at.present? && poll.votes.exists? - PollExpirationNotifyWorker.perform_at(poll.expires_at + 5.minutes, poll.id) - end - end - - private - - def expected_type? - equals_or_includes_any?(@json['type'], %w(Question)) - end -end diff --git a/app/services/after_block_domain_from_account_service.rb b/app/services/after_block_domain_from_account_service.rb deleted file mode 100644 index 3a84bd44..00000000 --- a/app/services/after_block_domain_from_account_service.rb +++ /dev/null @@ -1,32 +0,0 @@ -# frozen_string_literal: true - -class AfterBlockDomainFromAccountService < BaseService - # This service does not create an AccountDomainBlock record, - # it's meant to be called after such a record has been created - # synchronously, to "clean up" - def call(account, domain) - @account = account - @domain = domain - - reject_existing_followers! - reject_pending_follow_requests! - end - - private - - def reject_existing_followers! - @account.passive_relationships.where(account: Account.where(domain: @domain)).includes(:account).reorder(nil).find_each do |follow| - reject_follow!(follow) - end - end - - def reject_pending_follow_requests! - FollowRequest.where(target_account: @account).where(account: Account.where(domain: @domain)).includes(:account).reorder(nil).find_each do |follow_request| - reject_follow!(follow_request) - end - end - - def reject_follow!(follow) - follow.destroy - end -end diff --git a/app/services/after_block_service.rb b/app/services/after_block_service.rb index 706db0d6..c5bf1615 100644 --- a/app/services/after_block_service.rb +++ b/app/services/after_block_service.rb @@ -4,7 +4,6 @@ class AfterBlockService < BaseService def call(account, target_account) clear_home_feed(account, target_account) clear_notifications(account, target_account) - clear_conversations(account, target_account) end private @@ -13,13 +12,6 @@ class AfterBlockService < BaseService FeedManager.instance.clear_from_timeline(account, target_account) end - def clear_conversations(account, target_account) - AccountConversation.where(account: account) - .where('? = ANY(participant_account_ids)', target_account.id) - .in_batches - .destroy_all - end - def clear_notifications(account, target_account) Notification.where(account: account) .joins(:follow) diff --git a/app/services/app_sign_up_service.rb b/app/services/app_sign_up_service.rb index 6dee9cd8..ea02bc51 100644 --- a/app/services/app_sign_up_service.rb +++ b/app/services/app_sign_up_service.rb @@ -2,8 +2,6 @@ class AppSignUpService < BaseService def call(app, params) - return unless allowed_registrations? - user_params = params.slice(:email, :password, :agreement, :locale) account_params = params.slice(:username) user = User.create!(user_params.merge(created_by_application: app, password_confirmation: user_params[:password], account_attributes: account_params)) @@ -14,10 +12,4 @@ class AppSignUpService < BaseService expires_in: Doorkeeper.configuration.access_token_expires_in, use_refresh_token: Doorkeeper.configuration.refresh_token_enabled?) end - - private - - def allowed_registrations? - Setting.registrations_mode != 'none' && !Rails.configuration.x.single_user_mode - end end diff --git a/app/services/backup_service.rb b/app/services/backup_service.rb index 4cfa22ab..11a7e6fa 100644 --- a/app/services/backup_service.rb +++ b/app/services/backup_service.rb @@ -2,6 +2,7 @@ require 'rubygems/package' +# : todo : class BackupService < BaseService attr_reader :account, :backup, :collection diff --git a/app/services/batched_remove_status_service.rb b/app/services/batched_remove_status_service.rb index 6bcd3cb8..697608a2 100644 --- a/app/services/batched_remove_status_service.rb +++ b/app/services/batched_remove_status_service.rb @@ -1,7 +1,6 @@ # frozen_string_literal: true class BatchedRemoveStatusService < BaseService - include StreamEntryRenderer include Redisable # Delete given statuses and reblogs of them @@ -13,15 +12,12 @@ class BatchedRemoveStatusService < BaseService # @param [Hash] options # @option [Boolean] :skip_side_effects def call(statuses, **options) - statuses = Status.where(id: statuses.map(&:id)).includes(:account, :stream_entry).flat_map { |status| [status] + status.reblogs.includes(:account, :stream_entry).to_a } + statuses = Status.where(id: statuses.map(&:id)).includes(:account).flat_map { |status| [status] + status.reblogs.includes(:account).to_a } @mentions = statuses.each_with_object({}) { |s, h| h[s.id] = s.active_mentions.includes(:account).to_a } @tags = statuses.each_with_object({}) { |s, h| h[s.id] = s.tags.pluck(:name) } - @stream_entry_batches = [] - @salmon_batches = [] - @json_payloads = statuses.each_with_object({}) { |s, h| h[s.id] = Oj.dump(event: :delete, payload: s.id.to_s) } - @activity_xml = {} + @json_payloads = statuses.each_with_object({}) { |s, h| h[s.id] = Oj.dump(event: :delete, payload: s.id.to_s) } # Ensure that rendered XML reflects destroyed state statuses.each do |status| @@ -39,28 +35,12 @@ class BatchedRemoveStatusService < BaseService unpush_from_home_timelines(account, account_statuses) unpush_from_list_timelines(account, account_statuses) - - batch_stream_entries(account, account_statuses) if account.local? end - # Cannot be batched - statuses.each do |status| - unpush_from_public_timelines(status) - batch_salmon_slaps(status) if status.local? - end - - Pubsubhubbub::RawDistributionWorker.push_bulk(@stream_entry_batches) { |batch| batch } - NotificationWorker.push_bulk(@salmon_batches) { |batch| batch } end private - def batch_stream_entries(account, statuses) - statuses.each do |status| - @stream_entry_batches << [build_xml(status.stream_entry), account.id] - end - end - def unpush_from_home_timelines(account, statuses) recipients = account.followers_for_local_distribution.to_a @@ -81,36 +61,4 @@ class BatchedRemoveStatusService < BaseService end end - def unpush_from_public_timelines(status) - return unless status.public_visibility? - - payload = @json_payloads[status.id] - - redis.pipelined do - if status.account.is_pro || status.account.is_donor || status.account.is_investor || status.account.is_verified - redis.publish('timeline:pro', payload) - end - - @tags[status.id].each do |hashtag| - redis.publish("timeline:hashtag:#{hashtag}", payload) - redis.publish("timeline:hashtag:#{hashtag}:local", payload) if status.local? - end - end - end - - def batch_salmon_slaps(status) - return if @mentions[status.id].empty? - - recipients = @mentions[status.id].map(&:account).reject(&:local?).select(&:ostatus?).uniq(&:domain).map(&:id) - - recipients.each do |recipient_id| - @salmon_batches << [build_xml(status.stream_entry), status.account_id, recipient_id] - end - end - - def build_xml(stream_entry) - return @activity_xml[stream_entry.id] if @activity_xml.key?(stream_entry.id) - - @activity_xml[stream_entry.id] = stream_entry_to_xml(stream_entry) - end end diff --git a/app/services/block_domain_service.rb b/app/services/block_domain_service.rb deleted file mode 100644 index 497f0394..00000000 --- a/app/services/block_domain_service.rb +++ /dev/null @@ -1,89 +0,0 @@ -# frozen_string_literal: true - -class BlockDomainService < BaseService - attr_reader :domain_block - - def call(domain_block) - @domain_block = domain_block - process_domain_block! - end - - private - - def process_domain_block! - clear_media! if domain_block.reject_media? - - if domain_block.silence? - silence_accounts! - elsif domain_block.suspend? - suspend_accounts! - end - end - - def invalidate_association_caches! - # Normally, associated models of a status are immutable (except for accounts) - # so they are aggressively cached. After updating the media attachments to no - # longer point to a local file, we need to clear the cache to make those - # changes appear in the API and UI - @affected_status_ids.each { |id| Rails.cache.delete_matched("statuses/#{id}-*") } - end - - def silence_accounts! - blocked_domain_accounts.without_silenced.in_batches.update_all(silenced_at: @domain_block.created_at) - end - - def clear_media! - @affected_status_ids = [] - - clear_account_images! - clear_account_attachments! - clear_emojos! - - invalidate_association_caches! - end - - def suspend_accounts! - blocked_domain_accounts.without_suspended.reorder(nil).find_each do |account| - UnsubscribeService.new.call(account) if account.subscribed? - SuspendAccountService.new.call(account, suspended_at: @domain_block.created_at) - end - end - - def clear_account_images! - blocked_domain_accounts.reorder(nil).find_each do |account| - account.avatar.destroy if account.avatar.exists? - account.header.destroy if account.header.exists? - account.save - end - end - - def clear_account_attachments! - media_from_blocked_domain.reorder(nil).find_each do |attachment| - @affected_status_ids << attachment.status_id if attachment.status_id.present? - - attachment.file.destroy if attachment.file.exists? - attachment.type = :unknown - attachment.save - end - end - - def clear_emojos! - emojis_from_blocked_domains.destroy_all - end - - def blocked_domain - domain_block.domain - end - - def blocked_domain_accounts - Account.where(domain: blocked_domain) - end - - def media_from_blocked_domain - MediaAttachment.joins(:account).merge(blocked_domain_accounts).reorder(nil) - end - - def emojis_from_blocked_domains - CustomEmoji.where(domain: blocked_domain) - end -end diff --git a/app/services/concerns/author_extractor.rb b/app/services/concerns/author_extractor.rb deleted file mode 100644 index c2419e9e..00000000 --- a/app/services/concerns/author_extractor.rb +++ /dev/null @@ -1,23 +0,0 @@ -# frozen_string_literal: true - -module AuthorExtractor - def author_from_xml(xml, update_profile = true) - return nil if xml.nil? - - # Try
- 
-
-
-
-
-
-
- 
-
-
-
-
- å站导航
-
- 
-
-
-
-
-
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
-
- 
-
-
-
-
-
-
- 网å€å¤§å…¨
--
-
- 人民网.ä¸å›½ -
- æ–°åŽç½‘.ä¸å›½ -
- ä¸å¤®ç”µè§†å°.ä¸å›½ -
- 光明网.ä¸å›½ -
- 平安北京.ä¸å›½ -
- è”想微åš.ä¸å›½ -
- 首都网è¦.ä¸å›½ -
- 北京消防.ä¸å›½ -
- 海淀公安.ä¸å›½ -
- 通州è¦æ–¹.ä¸å›½ -
- 门头沟ç¦æ¯’.ä¸å›½ -
- 西部数ç .ä¸å›½ -
- ä¸å¤®ç”µè§†å°.ä¸å›½ -
- ä¸å›½ç§»åŠ¨.ä¸å›½ -
- 必胜宅急é€.ä¸å›½ -
- è€æ£å…´.ä¸å›½ -
- 广州酒家.ä¸å›½ -
- æ ¼åŠ›.ä¸å›½ -
- ç¦å»ºé‡‘爵.ä¸å›½ -
- 和信房产.ä¸å›½ -
- 金爵房地产.ä¸å›½ -
- è”泰地产.ä¸å›½ -
- é²å•†ç½®ä¸š.ä¸å›½ -
- é²å•†ç½®ä¸šè‚¡ä»½.ä¸å›½ -
- 美佳åŽ.ä¸å›½ -
- 金世纪工程.ä¸å›½ -
- 金世纪集团.ä¸å›½ -
- 深圳金世纪.ä¸å›½ -
- 总部基地.ä¸å›½ -
- 德律风.ä¸å›½ -
- 德律风物业.ä¸å›½ -
- 柯林.ä¸å›½ -
- 上海德律风物业.ä¸å›½ -
- 广东海å°é›†å›¢è‚¡ä»½.ä¸å›½ -
- 广东海å°é›†å›¢è‚¡ä»½æœ‰é™å…¬å¸.ä¸å›½ -
- 艺龙.ä¸å›½ -
- 北京旅游信æ¯ç½‘.ä¸å›½ -
- 北京故宫åšç‰©é™¢.ä¸å›½ -
- æ—…è¡Œå¼ å®¶ç•Œ.ä¸å›½ -
- å¼ å®¶ç•Œæ—…æ¸¸.ä¸å›½ -
- 广州市旅游局.ä¸å›½ -
- 旅游在线.ä¸å›½ -
- å¨æµ·æ—…游集散ä¸å¿ƒ.ä¸å›½ -
- 锦州旅游.ä¸å›½ -
- 金牛湖风景旅游度å‡åŒº.ä¸å›½ -
- 环çƒæ—…行社.ä¸å›½ -
- 养鹿场.ä¸å›½ -
- 东瀛游.ä¸å›½ -
- 东瀛游旅行社.ä¸å›½ -
- 桂林游.ä¸å›½ -
- 桂林之旅.ä¸å›½ -
- 美国环çƒæ—…行社.ä¸å›½ -
- 东天目山.ä¸å›½ -
- 凤山寺.ä¸å›½ -
- 黄沙å¤æ¸¡.ä¸å›½ -
- 城头山.ä¸å›½ -
- 港游网.ä¸å›½ -
- 一起游.ä¸å›½ -
- 山水家å›.ä¸å›½ -
- è’‹å··æ‘.ä¸å›½ -
- è’‹å··æ‘农业生æ€æ—…游.ä¸å›½ -
- 厦门海峡旅行社.ä¸å›½ -
- å§œå °å®¾é¦†.ä¸å›½ -
- 上海远洋宾馆.ä¸å›½ -
- çº¢æ Œå±±åº„.ä¸å›½ -
- 金牛湖风景旅游度å‡åŒº.ä¸å›½ -
- 金牛湖风景区.ä¸å›½ -
- 北京åŠå²›é…’店.ä¸å›½ -
- 比åŽåˆ©å±±åŠå²›é…’店.ä¸å›½ -
- 东京åŠå²›é…’店.ä¸å›½ -
- å›ä¹é…’店.ä¸å›½ -
- 凯迪å¨é…’店.ä¸å›½ -
- 莱州酒店.ä¸å›½ -
- 曼谷åŠå²›é…’店.ä¸å›½ -
- 上海åŠå²›é…’店.ä¸å›½ -
- 上虞国际大酒店.ä¸å›½ -
- 王府åŠå³¶é…’店.ä¸å›½ -
- 香港åŠå²›é…’店.ä¸å›½ -
- 银河大酒店.ä¸å›½ -
- å¥åº·365.ä¸å›½ -
- 家天下.ä¸å›½ -
- 北京大å¦ç¬¬ä¸‰åŒ»é™¢.ä¸å›½ -
- 西è—阜康医è¯.ä¸å›½ -
- 沈阳妇婴医院.ä¸å›½ -
- ç¦å»ºåŒ»ç§‘大å¦é™„属第一医院.ä¸å›½ -
- 北方è¯ä¸š.ä¸å›½ -
- 医è¯å¯¼æŠ¥.ä¸å›½ -
- ä¸å›½åŒ»è¯å¯¼æŠ¥.ä¸å›½ -
- 云å—çœåŒ»è¯æœ‰é™å…¬å¸.ä¸å›½ -
- 云å—çœåŒ»è¯.ä¸å›½ -
- 必胜宅急é€.ä¸å›½ -
- é’岛啤酒股份有é™å…¬å¸.ä¸å›½ -
- ç«é”…é¢.ä¸å›½ -
- 57度湘.ä¸å›½ -
- 澳門佳景集團.ä¸å›½ -
- 澳門佳景飲食集團.ä¸å›½ -
- 赤峰陈曲.ä¸å›½ -
- 春å®.ä¸å›½ -
- 富农水稻.ä¸å›½ -
- 功德林.ä¸å›½ -
- å¤èˆ¹.ä¸å›½ -
- å¤èˆ¹é£Ÿå“.ä¸å›½ -
- 红岩æ‘.ä¸å›½ -
- 佳景飲食集團.ä¸å›½ -
- èµ–æ°¸åˆé…’业.ä¸å›½ -
- 厉家èœ.ä¸å›½ -
- 莲花岛.ä¸å›½ -
- 廖平一两酒.ä¸å›½ -
- 龙轩.ä¸å›½ -
- 迈德ä¹.ä¸å›½ -
- 明记炖å“.ä¸å›½ -
- 明记炖å“世家.ä¸å›½ -
- 黔江鸡æ‚.ä¸å›½ -
- è–安娜餅屋.ä¸å›½ -
- åŽå¤èŒ¶ä¸šç½‘.ä¸å›½ -
- 宅香锅.ä¸å›½ -
- èžéº¦é¢.ä¸å›½ -
- å®…é¢åŠ.ä¸å›½ -
- 宅豆åŠ.ä¸å›½ -
- è‰åŽŸç¾”羊肉.ä¸å›½ -
- ç«é”…饺.ä¸å›½ -
- 鸟鸡蛋.ä¸å›½ -
- å®…ç±³é¥.ä¸å›½ -
- 白野猪肉.ä¸å›½ -
- 黑野猪肉.ä¸å›½ -
- 特色野猪肉.ä¸å›½ -
- 生æ€ç•œç‰§.ä¸å›½ -
- 野豆åŠ.ä¸å›½ -
- 野猪牧.ä¸å›½ -
- 野猪网.ä¸å›½ -
- 酷牛肉.ä¸å›½ -
- 羔羊网.ä¸å›½ -
- 野猪肉.ä¸å›½ -
- 鸟鸡肉.ä¸å›½ -
- è—羔羊.ä¸å›½ -
- 酷牛牧场.ä¸å›½ -
- 鸟鸡牧场.ä¸å›½ -
- 鸟鸡网.ä¸å›½ -
- 家é¤é¦†.ä¸å›½ -
- å®…ç«é”….ä¸å›½ -
- 食å“饮料网.ä¸å›½ -
- ä¸å›½æ¹¿å·¾.ä¸å›½ -
- 海特果èœ.ä¸å›½ -
- æžœèœ.ä¸å›½ -
- å®é‘«å¾·.ä¸å›½ -
- 北方烧酒.ä¸å›½ -
- 欧兰娑曼.ä¸å›½ -
- å¨å°”富.ä¸å›½ -
- 虎林è€çª–.ä¸å›½ -
- å”记食å“.ä¸å›½ -
- æ´¥æºé£Ÿå“.ä¸å›½ -
- æ´¥æº.ä¸å›½ -
- è€ä¸åŒ»å…»ç”Ÿ.ä¸å›½ -
- 山东伟龙食å“å…¬å¸.ä¸å›½ -
- 太泉蜂业.ä¸å›½ -
- 天鹅肉.ä¸å›½ -
- 望湘å›.ä¸å›½ -
- 伟龙饼干.ä¸å›½ -
- æ²ƒæ ¹è‘¡è„é…’.ä¸å›½ -
- 亚å¤é›†å›¢.ä¸å›½ -
- 鱼丸.ä¸å›½ -
- 真美集团.ä¸å›½ -
- 真美食å“.ä¸å›½ -
- ä¸å›½é¤é¥®æ ‡è¯†.ä¸å›½ -
- 迷奇.ä¸å›½ -
- ä¹éš†éš†.ä¸å›½ -
- 绞股è“.ä¸å›½ -
- 瀑布仙茗.ä¸å›½ -
- 金记食å“.ä¸å›½ -
- 朱è€å….ä¸å›½ -
- 嘉太.ä¸å›½ -
- é¡ºå¾·å ‚.ä¸å›½ -
- 广味æº.ä¸å›½ -
- 德辉食å“.ä¸å›½ -
- 金龙船.ä¸å›½ -
- 东方å³ç™½.ä¸å›½ -
- ä¸å±±åŽç¾Žå®žä¸š.ä¸å›½ -
- 富士äº.ä¸å›½ -
- 三安科技.ä¸å›½ -
- 供美香食å“.ä¸å›½ -
- 丰德天元.ä¸å›½ -
- è€è—医.ä¸å›½ -
- 新农仓.ä¸å›½ -
- æ¿ å‰.ä¸å›½ -
- å“味爽.ä¸å›½ -
- å¤è‚².ä¸å›½ -
- 皇宫食å“.ä¸å›½ -
- ä¾æµ·.ä¸å›½ -
- 广州凯虹.ä¸å›½ -
- å®å§¿æ—¥åŒ–.ä¸å›½ -
- ä¹é«˜ä¹.ä¸å›½ -
- 茂åŽé£Ÿå“.ä¸å›½ -
- 白鹿集团.ä¸å›½ -
- 好丽å‹é›†å›¢.ä¸å›½ -
- 法兰红.ä¸å›½ -
- 教育部.ä¸å›½ -
- 国家民委.ä¸å›½ -
- 人å£è®¡ç”Ÿå§”.ä¸å›½ -
- 工商总局.ä¸å›½ -
- 监察部.ä¸å›½ -
- 农业部.ä¸å›½ -
- 人民银行.ä¸å›½ -
- 侨办.ä¸å›½ -
- 食å“è¯å“监ç£å±€.ä¸å›½ -
- 科技部.ä¸å›½ -
- 财政部.ä¸å›½ -
- 文化部.ä¸å›½ -
- 审计署.ä¸å›½ -
- 体育总局.ä¸å›½ -
- 知识产æƒå±€.ä¸å›½ -
- å›½ç ”ç½‘.ä¸å›½ -
- 电监会.ä¸å›½ -
- 民航总局.ä¸å›½ -
- å«ç”Ÿéƒ¨.ä¸å›½ -
- 安全监察总局.ä¸å›½ -
- 国家行政å¦é™¢.ä¸å›½ -
- 申银万国.ä¸å›½ -
- ä¿å®šä¿é™©å会.ä¸å›½ -
- 和讯.ä¸å›½ -
- 招商è¯åˆ¸.ä¸å›½ -
- ä¸æŠ•è¯åˆ¸.ä¸å›½ -
- é¹å…ƒå¾ä¿¡.ä¸å›½ -
- ä¸èžè”åˆ.ä¸å›½ -
- 长城资产.ä¸å›½ -
- 周生生è‰åˆ¸.ä¸å›½ -
- ç¦å»ºæ¹„洲湾控股.ä¸å›½ -
- ä¸å®‰çŽ°é‡‘.ä¸å›½ -
- ä¸å®‰ä¿¡ä¸š.ä¸å›½ -
- è¯è¨Šè‰åˆ¸.ä¸å›½ -
- 元富ç†è²¡ç½‘.ä¸å›½ -
- 金立方资本.ä¸å›½ -
- 安信è¯åˆ¸.ä¸å›½ -
- ä¸å›½åˆ›ä¸šæŠ•èµ„网.ä¸å›½ -
- 進邦匯ç†.ä¸å›½ -
- ä¸å†é›†å›¢.ä¸å›½ -
- 交通银行.ä¸å›½ -
- 农业银行.ä¸å›½ -
- 民生银行.ä¸å›½ -
- 招商银行.ä¸å›½ -
- 黄河银行.ä¸å›½ -
- 周å£å¸‚商业银行.ä¸å›½ -
- 金èžå¿«çº¿.ä¸å›½ -
- 农信银.ä¸å›½ -
- ä¹padå¾®åš.ä¸å›½ -
- è”想显示器.ä¸å›½ -
- è”想打å°.ä¸å›½ -
- è”想Zæµè¡Œ.ä¸å›½ -
- ä¸å›½å›½é™…新闻网.ä¸å›½ -
- 洛阳电视å°.ä¸å›½ -
- 崇左新闻网.ä¸å›½ -
- 超越之路.ä¸å›½ -
- 长安教育网.ä¸å›½ -
- å”密茶é“.ä¸å›½ -
- 雷峰陪练.ä¸å›½ -
- è€ƒç ”.ä¸å›½ -
- 世界大å¦åŸŽ.ä¸å›½ -
- è·¯æ£é©¾æ ¡.ä¸å›½ -
- 比特å¨.ä¸å›½ -
- å‰æž—çœå†œä¸šç§‘å¦é™¢.ä¸å›½ -
- 普通è¯å®¡éŸ³.ä¸å›½ -
- 童帅国际教育.ä¸å›½ -
- æˆåŠŸä¹‹é’¥.ä¸å›½ -
- 西安ç†å·¥å¤§å¦.ä¸å›½ -
- 贵阳电脑å¦æ ¡.ä¸å›½ -
- 黑龙江çœå®žéªŒä¸å¦.ä¸å›½ -
- 浙江艺术èŒä¸šå¦é™¢.ä¸å›½ -
- èƒå¿†å¦å ‚.ä¸å›½ -
- é—½å—科技å¦é™¢.ä¸å›½ -
- 普通è¯è¯éŸ³.ä¸å›½ -
- éžå±±å¸ˆèŒƒå¤§å¦.ä¸å›½ -
- 北京电影å¦é™¢.ä¸å›½ -
- æˆéƒ½ç†å·¥å¤§å¦.ä¸å›½ -
- 东北大å¦.ä¸å›½ -
- èµ£å—师范å¦é™¢.ä¸å›½ -
- 广州大å¦.ä¸å›½ -
- 河北大å¦.ä¸å›½ -
- 河北科技师范å¦é™¢.ä¸å›½ -
- æ²³å—农业大å¦.ä¸å›½ -
- 江西师范大å¦.ä¸å›½ -
- è¾½å®å¤§å¦.ä¸å›½ -
- å—昌大å¦.ä¸å›½ -
- å—京ç†å·¥å¤§å¦.ä¸å›½ -
- é’岛大å¦.ä¸å›½ -
- 山东大å¦.ä¸å›½ -
- 汕头大å¦.ä¸å›½ -
- 上海交通大å¦.ä¸å›½ -
- 首都ç»æµŽè´¸æ˜“大å¦.ä¸å›½ -
- å››å·æ–‡ç†å¦é™¢.ä¸å›½ -
- 天津大å¦.ä¸å›½ -
- 五邑大å¦.ä¸å›½ -
- 百色å¦é™¢.ä¸å›½ -
- 北京化工大å¦.ä¸å›½ -
- 大连ç†å·¥å¤§å¦.ä¸å›½ -
- ç¦å»ºåŒ»ç§‘大å¦.ä¸å›½ -
- 广东工业大å¦.ä¸å›½ -
- æµ·å—师范大å¦.ä¸å›½ -
- 淮海工å¦é™¢.ä¸å›½ -
- è¾½å®å¯¹å¤–ç»è´¸å¦é™¢.ä¸å›½ -
- é’海师范大å¦.ä¸å›½ -
- 山东农业大å¦.ä¸å›½ -
- 上海财ç»å¤§å¦.ä¸å›½ -
- 上海ä¸åŒ»è¯å¤§å¦.ä¸å›½ -
- 首都师范大å¦.ä¸å›½ -
- 塔里木大å¦.ä¸å›½ -
- 西安电å科技大å¦.ä¸å›½ -
- 清åŽå¤§å¦.ä¸å›½ -
- 大连医科大å¦.ä¸å›½ -
- 贵州大å¦.ä¸å›½ -
- 哈尔滨å¦é™¢.ä¸å›½ -
- æµ·å—医å¦é™¢.ä¸å›½ -
- 黑龙江大å¦.ä¸å›½ -
- 集美大å¦.ä¸å›½ -
- å—京邮电大å¦.ä¸å›½ -
- 上海大å¦.ä¸å›½ -
- 深圳大å¦.ä¸å›½ -
- å››å·å¤§å¦.ä¸å›½ -
- 天津师范大å¦.ä¸å›½ -
- 西安工业大å¦.ä¸å›½ -
- 北åŽå¤§å¦.ä¸å›½ -
- 防ç¾ç§‘技å¦é™¢.ä¸å›½ -
- 甘肃农业大å¦.ä¸å›½ -
- 广西师范å¦é™¢.ä¸å›½ -
- 哈尔滨医科大å¦.ä¸å›½ -
- 河北科技大å¦.ä¸å›½ -
- 内蒙å¤å¤§å¦.ä¸å›½ -
- å®å¤å¤§å¦.ä¸å›½ -
- 山东财ç»å¤§å¦.ä¸å›½ -
- 陕西师范大å¦.ä¸å›½ -
- 上海对外贸易å¦é™¢.ä¸å›½ -
- å››å·è¦å¯Ÿå¦é™¢.ä¸å›½ -
- 西åŽå¤§å¦.ä¸å›½ -
- 许昌å¦é™¢.ä¸å›½ -
- 扬州大å¦.ä¸å›½ -
- ä¸å›½çŸ¿ä¸šå¤§å¦.ä¸å›½ -
- ä¸å—大å¦.ä¸å›½ -
- 西安ç†å·¥å¤§å¦.ä¸å›½ -
- 烟å°å¤§å¦.ä¸å›½ -
- 漳州师范å¦é™¢.ä¸å›½ -
- 郑州大å¦.ä¸å›½ -
- ä¸å›½å†œä¸šå¤§å¦.ä¸å›½ -
- ä¸å›½åŒ»è¯å¤§å¦.ä¸å›½ -
- 西安邮电å¦é™¢.ä¸å›½ -
- 新疆大å¦.ä¸å›½ -
- 云å—师范大å¦.ä¸å›½ -
- ä¸å›½æ”¿æ³•å¤§å¦.ä¸å›½ -
- 西昌å¦é™¢.ä¸å›½ -
- 新疆农业大å¦.ä¸å›½ -
- 浙江万里å¦é™¢.ä¸å›½ -
- é‡åº†å¤§å¦.ä¸å›½ - -
-
-
-
-
-
-
-
diff --git a/spec/fixtures/requests/json-ld.activitystreams.txt b/spec/fixtures/requests/json-ld.activitystreams.txt
deleted file mode 100644
index 395797b2..00000000
--- a/spec/fixtures/requests/json-ld.activitystreams.txt
+++ /dev/null
@@ -1,391 +0,0 @@
-HTTP/1.1 200 OK
-Date: Tue, 01 May 2018 23:25:57 GMT
-Content-Location: activitystreams.jsonld
-Vary: negotiate,accept
-TCN: choice
-Last-Modified: Mon, 16 Apr 2018 00:28:23 GMT
-ETag: "1eb0-569ec4caa97c0;d3-540ee27e0eec0"
-Accept-Ranges: bytes
-Content-Length: 7856
-Cache-Control: max-age=21600
-Expires: Wed, 02 May 2018 05:25:57 GMT
-P3P: policyref="http://www.w3.org/2014/08/p3p.xml"
-Access-Control-Allow-Origin: *
-Content-Type: application/ld+json
-Strict-Transport-Security: max-age=15552000; includeSubdomains; preload
-Content-Security-Policy: upgrade-insecure-requests
-
-{
- "@context": {
- "@vocab": "_:",
- "xsd": "http://www.w3.org/2001/XMLSchema#",
- "as": "https://www.w3.org/ns/activitystreams#",
- "ldp": "http://www.w3.org/ns/ldp#",
- "id": "@id",
- "type": "@type",
- "Accept": "as:Accept",
- "Activity": "as:Activity",
- "IntransitiveActivity": "as:IntransitiveActivity",
- "Add": "as:Add",
- "Announce": "as:Announce",
- "Application": "as:Application",
- "Arrive": "as:Arrive",
- "Article": "as:Article",
- "Audio": "as:Audio",
- "Block": "as:Block",
- "Collection": "as:Collection",
- "CollectionPage": "as:CollectionPage",
- "Relationship": "as:Relationship",
- "Create": "as:Create",
- "Delete": "as:Delete",
- "Dislike": "as:Dislike",
- "Document": "as:Document",
- "Event": "as:Event",
- "Follow": "as:Follow",
- "Flag": "as:Flag",
- "Group": "as:Group",
- "Ignore": "as:Ignore",
- "Image": "as:Image",
- "Invite": "as:Invite",
- "Join": "as:Join",
- "Leave": "as:Leave",
- "Like": "as:Like",
- "Link": "as:Link",
- "Mention": "as:Mention",
- "Note": "as:Note",
- "Object": "as:Object",
- "Offer": "as:Offer",
- "OrderedCollection": "as:OrderedCollection",
- "OrderedCollectionPage": "as:OrderedCollectionPage",
- "Organization": "as:Organization",
- "Page": "as:Page",
- "Person": "as:Person",
- "Place": "as:Place",
- "Profile": "as:Profile",
- "Question": "as:Question",
- "Reject": "as:Reject",
- "Remove": "as:Remove",
- "Service": "as:Service",
- "TentativeAccept": "as:TentativeAccept",
- "TentativeReject": "as:TentativeReject",
- "Tombstone": "as:Tombstone",
- "Undo": "as:Undo",
- "Update": "as:Update",
- "Video": "as:Video",
- "View": "as:View",
- "Listen": "as:Listen",
- "Read": "as:Read",
- "Move": "as:Move",
- "Travel": "as:Travel",
- "IsFollowing": "as:IsFollowing",
- "IsFollowedBy": "as:IsFollowedBy",
- "IsContact": "as:IsContact",
- "IsMember": "as:IsMember",
- "subject": {
- "@id": "as:subject",
- "@type": "@id"
- },
- "relationship": {
- "@id": "as:relationship",
- "@type": "@id"
- },
- "actor": {
- "@id": "as:actor",
- "@type": "@id"
- },
- "attributedTo": {
- "@id": "as:attributedTo",
- "@type": "@id"
- },
- "attachment": {
- "@id": "as:attachment",
- "@type": "@id"
- },
- "bcc": {
- "@id": "as:bcc",
- "@type": "@id"
- },
- "bto": {
- "@id": "as:bto",
- "@type": "@id"
- },
- "cc": {
- "@id": "as:cc",
- "@type": "@id"
- },
- "context": {
- "@id": "as:context",
- "@type": "@id"
- },
- "current": {
- "@id": "as:current",
- "@type": "@id"
- },
- "first": {
- "@id": "as:first",
- "@type": "@id"
- },
- "generator": {
- "@id": "as:generator",
- "@type": "@id"
- },
- "icon": {
- "@id": "as:icon",
- "@type": "@id"
- },
- "image": {
- "@id": "as:image",
- "@type": "@id"
- },
- "inReplyTo": {
- "@id": "as:inReplyTo",
- "@type": "@id"
- },
- "items": {
- "@id": "as:items",
- "@type": "@id"
- },
- "instrument": {
- "@id": "as:instrument",
- "@type": "@id"
- },
- "orderedItems": {
- "@id": "as:items",
- "@type": "@id",
- "@container": "@list"
- },
- "last": {
- "@id": "as:last",
- "@type": "@id"
- },
- "location": {
- "@id": "as:location",
- "@type": "@id"
- },
- "next": {
- "@id": "as:next",
- "@type": "@id"
- },
- "object": {
- "@id": "as:object",
- "@type": "@id"
- },
- "oneOf": {
- "@id": "as:oneOf",
- "@type": "@id"
- },
- "anyOf": {
- "@id": "as:anyOf",
- "@type": "@id"
- },
- "closed": {
- "@id": "as:closed",
- "@type": "xsd:dateTime"
- },
- "origin": {
- "@id": "as:origin",
- "@type": "@id"
- },
- "accuracy": {
- "@id": "as:accuracy",
- "@type": "xsd:float"
- },
- "prev": {
- "@id": "as:prev",
- "@type": "@id"
- },
- "preview": {
- "@id": "as:preview",
- "@type": "@id"
- },
- "replies": {
- "@id": "as:replies",
- "@type": "@id"
- },
- "result": {
- "@id": "as:result",
- "@type": "@id"
- },
- "audience": {
- "@id": "as:audience",
- "@type": "@id"
- },
- "partOf": {
- "@id": "as:partOf",
- "@type": "@id"
- },
- "tag": {
- "@id": "as:tag",
- "@type": "@id"
- },
- "target": {
- "@id": "as:target",
- "@type": "@id"
- },
- "to": {
- "@id": "as:to",
- "@type": "@id"
- },
- "url": {
- "@id": "as:url",
- "@type": "@id"
- },
- "altitude": {
- "@id": "as:altitude",
- "@type": "xsd:float"
- },
- "content": "as:content",
- "contentMap": {
- "@id": "as:content",
- "@container": "@language"
- },
- "name": "as:name",
- "nameMap": {
- "@id": "as:name",
- "@container": "@language"
- },
- "duration": {
- "@id": "as:duration",
- "@type": "xsd:duration"
- },
- "endTime": {
- "@id": "as:endTime",
- "@type": "xsd:dateTime"
- },
- "height": {
- "@id": "as:height",
- "@type": "xsd:nonNegativeInteger"
- },
- "href": {
- "@id": "as:href",
- "@type": "@id"
- },
- "hreflang": "as:hreflang",
- "latitude": {
- "@id": "as:latitude",
- "@type": "xsd:float"
- },
- "longitude": {
- "@id": "as:longitude",
- "@type": "xsd:float"
- },
- "mediaType": "as:mediaType",
- "published": {
- "@id": "as:published",
- "@type": "xsd:dateTime"
- },
- "radius": {
- "@id": "as:radius",
- "@type": "xsd:float"
- },
- "rel": "as:rel",
- "startIndex": {
- "@id": "as:startIndex",
- "@type": "xsd:nonNegativeInteger"
- },
- "startTime": {
- "@id": "as:startTime",
- "@type": "xsd:dateTime"
- },
- "summary": "as:summary",
- "summaryMap": {
- "@id": "as:summary",
- "@container": "@language"
- },
- "totalItems": {
- "@id": "as:totalItems",
- "@type": "xsd:nonNegativeInteger"
- },
- "units": "as:units",
- "updated": {
- "@id": "as:updated",
- "@type": "xsd:dateTime"
- },
- "width": {
- "@id": "as:width",
- "@type": "xsd:nonNegativeInteger"
- },
- "describes": {
- "@id": "as:describes",
- "@type": "@id"
- },
- "formerType": {
- "@id": "as:formerType",
- "@type": "@id"
- },
- "deleted": {
- "@id": "as:deleted",
- "@type": "xsd:dateTime"
- },
- "inbox": {
- "@id": "ldp:inbox",
- "@type": "@id"
- },
- "outbox": {
- "@id": "as:outbox",
- "@type": "@id"
- },
- "following": {
- "@id": "as:following",
- "@type": "@id"
- },
- "followers": {
- "@id": "as:followers",
- "@type": "@id"
- },
- "streams": {
- "@id": "as:streams",
- "@type": "@id"
- },
- "preferredUsername": "as:preferredUsername",
- "endpoints": {
- "@id": "as:endpoints",
- "@type": "@id"
- },
- "uploadMedia": {
- "@id": "as:uploadMedia",
- "@type": "@id"
- },
- "proxyUrl": {
- "@id": "as:proxyUrl",
- "@type": "@id"
- },
- "liked": {
- "@id": "as:liked",
- "@type": "@id"
- },
- "oauthAuthorizationEndpoint": {
- "@id": "as:oauthAuthorizationEndpoint",
- "@type": "@id"
- },
- "oauthTokenEndpoint": {
- "@id": "as:oauthTokenEndpoint",
- "@type": "@id"
- },
- "provideClientKey": {
- "@id": "as:provideClientKey",
- "@type": "@id"
- },
- "signClientKey": {
- "@id": "as:signClientKey",
- "@type": "@id"
- },
- "sharedInbox": {
- "@id": "as:sharedInbox",
- "@type": "@id"
- },
- "Public": {
- "@id": "as:Public",
- "@type": "@id"
- },
- "source": "as:source",
- "likes": {
- "@id": "as:likes",
- "@type": "@id"
- },
- "shares": {
- "@id": "as:shares",
- "@type": "@id"
- }
- }
-}
diff --git a/spec/fixtures/requests/json-ld.identity.txt b/spec/fixtures/requests/json-ld.identity.txt
deleted file mode 100644
index 8810526c..00000000
--- a/spec/fixtures/requests/json-ld.identity.txt
+++ /dev/null
@@ -1,100 +0,0 @@
-HTTP/1.1 200 OK
-Accept-Ranges: bytes
-Access-Control-Allow-Headers: DNT,X-Mx-ReqToken,Keep-Alive,User-Agent,X-Requested-With,If-Modified-Since,Cache-Control,Content-Type,Accept-Encoding
-Access-Control-Allow-Origin: *
-Content-Type: application/ld+json
-Date: Tue, 01 May 2018 23:28:21 GMT
-Etag: "e26-547a6fc75b04a-gzip"
-Last-Modified: Fri, 03 Feb 2017 21:30:09 GMT
-Server: Apache/2.4.7 (Ubuntu)
-Vary: Accept-Encoding
-Transfer-Encoding: chunked
-
-{
- "@context": {
- "id": "@id",
- "type": "@type",
-
- "cred": "https://w3id.org/credentials#",
- "dc": "http://purl.org/dc/terms/",
- "identity": "https://w3id.org/identity#",
- "perm": "https://w3id.org/permissions#",
- "ps": "https://w3id.org/payswarm#",
- "rdf": "http://www.w3.org/1999/02/22-rdf-syntax-ns#",
- "rdfs": "http://www.w3.org/2000/01/rdf-schema#",
- "sec": "https://w3id.org/security#",
- "schema": "http://schema.org/",
- "xsd": "http://www.w3.org/2001/XMLSchema#",
-
- "Group": "https://www.w3.org/ns/activitystreams#Group",
-
- "claim": {"@id": "cred:claim", "@type": "@id"},
- "credential": {"@id": "cred:credential", "@type": "@id"},
- "issued": {"@id": "cred:issued", "@type": "xsd:dateTime"},
- "issuer": {"@id": "cred:issuer", "@type": "@id"},
- "recipient": {"@id": "cred:recipient", "@type": "@id"},
- "Credential": "cred:Credential",
- "CryptographicKeyCredential": "cred:CryptographicKeyCredential",
-
- "about": {"@id": "schema:about", "@type": "@id"},
- "address": {"@id": "schema:address", "@type": "@id"},
- "addressCountry": "schema:addressCountry",
- "addressLocality": "schema:addressLocality",
- "addressRegion": "schema:addressRegion",
- "comment": "rdfs:comment",
- "created": {"@id": "dc:created", "@type": "xsd:dateTime"},
- "creator": {"@id": "dc:creator", "@type": "@id"},
- "description": "schema:description",
- "email": "schema:email",
- "familyName": "schema:familyName",
- "givenName": "schema:givenName",
- "image": {"@id": "schema:image", "@type": "@id"},
- "label": "rdfs:label",
- "name": "schema:name",
- "postalCode": "schema:postalCode",
- "streetAddress": "schema:streetAddress",
- "title": "dc:title",
- "url": {"@id": "schema:url", "@type": "@id"},
- "Person": "schema:Person",
- "PostalAddress": "schema:PostalAddress",
- "Organization": "schema:Organization",
-
- "identityService": {"@id": "identity:identityService", "@type": "@id"},
- "idp": {"@id": "identity:idp", "@type": "@id"},
- "Identity": "identity:Identity",
-
- "paymentProcessor": "ps:processor",
- "preferences": {"@id": "ps:preferences", "@type": "@vocab"},
-
- "cipherAlgorithm": "sec:cipherAlgorithm",
- "cipherData": "sec:cipherData",
- "cipherKey": "sec:cipherKey",
- "digestAlgorithm": "sec:digestAlgorithm",
- "digestValue": "sec:digestValue",
- "domain": "sec:domain",
- "expires": {"@id": "sec:expiration", "@type": "xsd:dateTime"},
- "initializationVector": "sec:initializationVector",
- "member": {"@id": "schema:member", "@type": "@id"},
- "memberOf": {"@id": "schema:memberOf", "@type": "@id"},
- "nonce": "sec:nonce",
- "normalizationAlgorithm": "sec:normalizationAlgorithm",
- "owner": {"@id": "sec:owner", "@type": "@id"},
- "password": "sec:password",
- "privateKey": {"@id": "sec:privateKey", "@type": "@id"},
- "privateKeyPem": "sec:privateKeyPem",
- "publicKey": {"@id": "sec:publicKey", "@type": "@id"},
- "publicKeyPem": "sec:publicKeyPem",
- "publicKeyService": {"@id": "sec:publicKeyService", "@type": "@id"},
- "revoked": {"@id": "sec:revoked", "@type": "xsd:dateTime"},
- "signature": "sec:signature",
- "signatureAlgorithm": "sec:signatureAlgorithm",
- "signatureValue": "sec:signatureValue",
- "CryptographicKey": "sec:Key",
- "EncryptedMessage": "sec:EncryptedMessage",
- "GraphSignature2012": "sec:GraphSignature2012",
- "LinkedDataSignature2015": "sec:LinkedDataSignature2015",
-
- "accessControl": {"@id": "perm:accessControl", "@type": "@id"},
- "writePermission": {"@id": "perm:writePermission", "@type": "@id"}
- }
-}
diff --git a/spec/fixtures/requests/json-ld.security.txt b/spec/fixtures/requests/json-ld.security.txt
deleted file mode 100644
index 0d29903e..00000000
--- a/spec/fixtures/requests/json-ld.security.txt
+++ /dev/null
@@ -1,61 +0,0 @@
-HTTP/1.1 200 OK
-Accept-Ranges: bytes
-Access-Control-Allow-Headers: DNT,X-Mx-ReqToken,Keep-Alive,User-Agent,X-Requested-With,If-Modified-Since,Cache-Control,Content-Type,Accept-Encoding
-Access-Control-Allow-Origin: *
-Content-Type: application/ld+json
-Date: Wed, 02 May 2018 16:25:32 GMT
-Etag: "7e3-5651ec0f7c5ed-gzip"
-Last-Modified: Tue, 13 Feb 2018 21:34:04 GMT
-Server: Apache/2.4.7 (Ubuntu)
-Vary: Accept-Encoding
-Content-Length: 2019
-
-{
- "@context": {
- "id": "@id",
- "type": "@type",
-
- "dc": "http://purl.org/dc/terms/",
- "sec": "https://w3id.org/security#",
- "xsd": "http://www.w3.org/2001/XMLSchema#",
-
- "EcdsaKoblitzSignature2016": "sec:EcdsaKoblitzSignature2016",
- "Ed25519Signature2018": "sec:Ed25519Signature2018",
- "EncryptedMessage": "sec:EncryptedMessage",
- "GraphSignature2012": "sec:GraphSignature2012",
- "LinkedDataSignature2015": "sec:LinkedDataSignature2015",
- "LinkedDataSignature2016": "sec:LinkedDataSignature2016",
- "CryptographicKey": "sec:Key",
-
- "authenticationTag": "sec:authenticationTag",
- "canonicalizationAlgorithm": "sec:canonicalizationAlgorithm",
- "cipherAlgorithm": "sec:cipherAlgorithm",
- "cipherData": "sec:cipherData",
- "cipherKey": "sec:cipherKey",
- "created": {"@id": "dc:created", "@type": "xsd:dateTime"},
- "creator": {"@id": "dc:creator", "@type": "@id"},
- "digestAlgorithm": "sec:digestAlgorithm",
- "digestValue": "sec:digestValue",
- "domain": "sec:domain",
- "encryptionKey": "sec:encryptionKey",
- "expiration": {"@id": "sec:expiration", "@type": "xsd:dateTime"},
- "expires": {"@id": "sec:expiration", "@type": "xsd:dateTime"},
- "initializationVector": "sec:initializationVector",
- "iterationCount": "sec:iterationCount",
- "nonce": "sec:nonce",
- "normalizationAlgorithm": "sec:normalizationAlgorithm",
- "owner": {"@id": "sec:owner", "@type": "@id"},
- "password": "sec:password",
- "privateKey": {"@id": "sec:privateKey", "@type": "@id"},
- "privateKeyPem": "sec:privateKeyPem",
- "publicKey": {"@id": "sec:publicKey", "@type": "@id"},
- "publicKeyBase58": "sec:publicKeyBase58",
- "publicKeyPem": "sec:publicKeyPem",
- "publicKeyService": {"@id": "sec:publicKeyService", "@type": "@id"},
- "revoked": {"@id": "sec:revoked", "@type": "xsd:dateTime"},
- "salt": "sec:salt",
- "signature": "sec:signature",
- "signatureAlgorithm": "sec:signingAlgorithm",
- "signatureValue": "sec:signatureValue"
- }
-}
diff --git a/spec/fixtures/requests/koi8-r.txt b/spec/fixtures/requests/koi8-r.txt
deleted file mode 100644
index d4242af0..00000000
--- a/spec/fixtures/requests/koi8-r.txt
+++ /dev/null
@@ -1,20 +0,0 @@
-HTTP/1.1 200 OK
-Server: nginx/1.11.10
-Date: Tue, 04 Jul 2017 16:43:39 GMT
-Content-Type: text/html
-Content-Length: 273
-Connection: keep-alive
-Last-Modified: Tue, 04 Jul 2017 16:41:34 GMT
-Accept-Ranges: bytes
-
-
-
-
-
- ä¸æ–‡åŸŸå简介
-- “ä¸å›½åŸŸåâ€æ˜¯ä¸æ–‡åŸŸå的一ç§ï¼Œç‰¹æŒ‡ä»¥â€œä¸å›½â€ä¸ºåŽç¼€çš„ä¸æ–‡åŸŸå，是我国域å体系和全çƒäº’è”网域å体系的é‡è¦ç»„æˆéƒ¨åˆ†ã€‚“ä¸å›½â€æ˜¯åœ¨å…¨çƒäº’è”网上代表ä¸å›½çš„ä¸æ–‡é¡¶çº§åŸŸå，于2010å¹´7月æ£å¼çº³å…¥å…¨çƒäº’è”网域å体系，全çƒäº’è”网域å体系，全çƒç½‘æ°‘å¯é€šè¿‡è”ç½‘è®¡ç®—æœºåœ¨ä¸–ç•Œä»»ä½•å›½å®¶å’Œåœ°åŒºå®žçŽ°æ— éšœç¢è®¿é—®ã€‚“ä¸å›½â€åŸŸå在使用上和 .CN，相似属于互è”网上的基础æœåŠ¡ï¼ŒåŸºäºŽåŸŸåå¯ä»¥æä¾›WWW.EMAIL FTPç‰åº”用æœåŠ¡ã€‚ -
--
- - diff --git a/spec/fixtures/requests/localdomain-feed.txt b/spec/fixtures/requests/localdomain-feed.txt deleted file mode 100644 index 03aa492f..00000000 --- a/spec/fixtures/requests/localdomain-feed.txt +++ /dev/null @@ -1,57 +0,0 @@ -HTTP/1.1 200 OK -Date: Thu, 20 Apr 2017 07:36:08 GMT -Content-Type: application/atom+xml; charset=utf-8 -Transfer-Encoding: chunked -Connection: keep-alive -Server: GabSocial -X-Frame-Options: DENY -X-Content-Type-Options: nosniff -X-XSS-Protection: 1; mode=block -Link:
-
- - diff --git a/spec/fixtures/requests/sjis_with_wrong_charset.txt b/spec/fixtures/requests/sjis_with_wrong_charset.txt deleted file mode 100644 index 456750c6..00000000 --- a/spec/fixtures/requests/sjis_with_wrong_charset.txt +++ /dev/null @@ -1,20 +0,0 @@ -HTTP/1.1 200 OK -Server: nginx/1.11.10 -Date: Tue, 04 Jul 2017 16:43:39 GMT -Content-Type: text/html; charset=utf-8 -Content-Length: 273 -Connection: keep-alive -Last-Modified: Tue, 04 Jul 2017 16:41:34 GMT -Accept-Ranges: bytes - - - - - -
-
- - diff --git a/spec/fixtures/requests/webfinger-hacker1.txt b/spec/fixtures/requests/webfinger-hacker1.txt deleted file mode 100644 index 3752b0a7..00000000 --- a/spec/fixtures/requests/webfinger-hacker1.txt +++ /dev/null @@ -1,11 +0,0 @@ -HTTP/1.1 200 OK -Server: nginx/1.6.2 -Date: Sun, 20 Mar 2016 11:13:16 GMT -Content-Type: application/jrd+json -Transfer-Encoding: chunked -Connection: keep-alive -Access-Control-Allow-Origin: * -Vary: Accept-Encoding,Cookie -Strict-Transport-Security: max-age=31536000; includeSubdomains; - -{"subject":"acct:robcolbert@quitter.no","aliases":["https:\/\/quitter.no\/user\/7477","https:\/\/quitter.no\/robcolbert","https:\/\/quitter.no\/index.php\/user\/7477","https:\/\/quitter.no\/index.php\/robcolbert"],"links":[{"rel":"http:\/\/webfinger.net\/rel\/profile-page","type":"text\/html","href":"https:\/\/quitter.no\/robcolbert"},{"rel":"http:\/\/gmpg.org\/xfn\/11","type":"text\/html","href":"https:\/\/quitter.no\/robcolbert"},{"rel":"describedby","type":"application\/rdf+xml","href":"https:\/\/quitter.no\/robcolbert\/foaf"},{"rel":"http:\/\/apinamespace.org\/atom","type":"application\/atomsvc+xml","href":"https:\/\/quitter.no\/api\/statusnet\/app\/service\/robcolbert.xml"},{"rel":"http:\/\/apinamespace.org\/twitter","href":"https:\/\/quitter.no\/api\/"},{"rel":"http:\/\/specs.openid.net\/auth\/2.0\/provider","href":"https:\/\/quitter.no\/robcolbert"},{"rel":"http:\/\/schemas.google.com\/g\/2010#updates-from","type":"application\/atom+xml","href":"https:\/\/quitter.no\/api\/statuses\/user_timeline\/7477.atom"},{"rel":"magic-public-key","href":"data:application\/magic-public-key,RSA.1ZBkHTavLvxH3FzlKv4O6WtlILKRFfNami3_Rcu8EuogtXSYiS-bB6hElZfUCSHbC4uLemOA34PEhz__CDMozax1iI_t8dzjDnh1x0iFSup7pSfW9iXk_WU3Dm74yWWW2jildY41vWgrEstuQ1dJ8vVFfSJ9T_tO4c-T9y8vDI8=.AQAB"},{"rel":"salmon","href":"https:\/\/hacker.com\/main\/salmon\/user\/7477"},{"rel":"http:\/\/salmon-protocol.org\/ns\/salmon-replies","href":"https:\/\/quitter.no\/main\/salmon\/user\/7477"},{"rel":"http:\/\/salmon-protocol.org\/ns\/salmon-mention","href":"https:\/\/quitter.no\/main\/salmon\/user\/7477"},{"rel":"http:\/\/ostatus.org\/schema\/1.0\/subscribe","template":"https:\/\/quitter.no\/main\/ostatussub?profile={uri}"}]} diff --git a/spec/fixtures/requests/webfinger-hacker2.txt b/spec/fixtures/requests/webfinger-hacker2.txt deleted file mode 100644 index 09d1a206..00000000 --- a/spec/fixtures/requests/webfinger-hacker2.txt +++ /dev/null @@ -1,11 +0,0 @@ -HTTP/1.1 200 OK -Server: nginx/1.6.2 -Date: Sun, 20 Mar 2016 11:13:16 GMT -Content-Type: application/jrd+json -Transfer-Encoding: chunked -Connection: keep-alive -Access-Control-Allow-Origin: * -Vary: Accept-Encoding,Cookie -Strict-Transport-Security: max-age=31536000; includeSubdomains; - -{"subject":"acct:catsrgr8@quitter.no","aliases":["https:\/\/quitter.no\/user\/7477","https:\/\/quitter.no\/robcolbert","https:\/\/quitter.no\/index.php\/user\/7477","https:\/\/quitter.no\/index.php\/robcolbert"],"links":[{"rel":"http:\/\/webfinger.net\/rel\/profile-page","type":"text\/html","href":"https:\/\/quitter.no\/robcolbert"},{"rel":"http:\/\/gmpg.org\/xfn\/11","type":"text\/html","href":"https:\/\/quitter.no\/robcolbert"},{"rel":"describedby","type":"application\/rdf+xml","href":"https:\/\/quitter.no\/robcolbert\/foaf"},{"rel":"http:\/\/apinamespace.org\/atom","type":"application\/atomsvc+xml","href":"https:\/\/quitter.no\/api\/statusnet\/app\/service\/robcolbert.xml"},{"rel":"http:\/\/apinamespace.org\/twitter","href":"https:\/\/quitter.no\/api\/"},{"rel":"http:\/\/specs.openid.net\/auth\/2.0\/provider","href":"https:\/\/quitter.no\/robcolbert"},{"rel":"http:\/\/schemas.google.com\/g\/2010#updates-from","type":"application\/atom+xml","href":"https:\/\/quitter.no\/api\/statuses\/user_timeline\/7477.atom"},{"rel":"magic-public-key","href":"data:application\/magic-public-key,RSA.1ZBkHTavLvxH3FzlKv4O6WtlILKRFfNami3_Rcu8EuogtXSYiS-bB6hElZfUCSHbC4uLemOA34PEhz__CDMozax1iI_t8dzjDnh1x0iFSup7pSfW9iXk_WU3Dm74yWWW2jildY41vWgrEstuQ1dJ8vVFfSJ9T_tO4c-T9y8vDI8=.AQAB"},{"rel":"salmon","href":"https:\/\/quitter.no\/main\/salmon\/user\/7477"},{"rel":"http:\/\/salmon-protocol.org\/ns\/salmon-replies","href":"https:\/\/quitter.no\/main\/salmon\/user\/7477"},{"rel":"http:\/\/salmon-protocol.org\/ns\/salmon-mention","href":"https:\/\/quitter.no\/main\/salmon\/user\/7477"},{"rel":"http:\/\/ostatus.org\/schema\/1.0\/subscribe","template":"https:\/\/quitter.no\/main\/ostatussub?profile={uri}"}]} diff --git a/spec/fixtures/requests/webfinger-hacker3.txt b/spec/fixtures/requests/webfinger-hacker3.txt deleted file mode 100644 index 7e508d3b..00000000 --- a/spec/fixtures/requests/webfinger-hacker3.txt +++ /dev/null @@ -1,11 +0,0 @@ -HTTP/1.1 200 OK -Server: nginx/1.6.2 -Date: Sun, 20 Mar 2016 11:13:16 GMT -Content-Type: application/jrd+json -Transfer-Encoding: chunked -Connection: keep-alive -Access-Control-Allow-Origin: * -Vary: Accept-Encoding,Cookie -Strict-Transport-Security: max-age=31536000; includeSubdomains; - -{"subject":"acct:localhost@kickass.zone","aliases":["https:\/\/kickass.zone\/user\/7477","https:\/\/kickass.zone\/robcolbert","https:\/\/kickass.zone\/index.php\/user\/7477","https:\/\/kickass.zone\/index.php\/robcolbert"],"links":[{"rel":"http:\/\/webfinger.net\/rel\/profile-page","type":"text\/html","href":"https:\/\/kickass.zone\/robcolbert"},{"rel":"http:\/\/gmpg.org\/xfn\/11","type":"text\/html","href":"https:\/\/kickass.zone\/robcolbert"},{"rel":"describedby","type":"application\/rdf+xml","href":"https:\/\/kickass.zone\/robcolbert\/foaf"},{"rel":"http:\/\/apinamespace.org\/atom","type":"application\/atomsvc+xml","href":"https:\/\/kickass.zone\/api\/statusnet\/app\/service\/robcolbert.xml"},{"rel":"http:\/\/apinamespace.org\/twitter","href":"https:\/\/kickass.zone\/api\/"},{"rel":"http:\/\/specs.openid.net\/auth\/2.0\/provider","href":"https:\/\/kickass.zone\/robcolbert"},{"rel":"http:\/\/schemas.google.com\/g\/2010#updates-from","type":"application\/atom+xml","href":"https:\/\/kickass.zone\/api\/statuses\/user_timeline\/7477.atom"},{"rel":"magic-public-key","href":"data:application\/magic-public-key,RSA.1ZBkHTavLvxH3FzlKv4O6WtlILKRFfNami3_Rcu8EuogtXSYiS-bB6hElZfUCSHbC4uLemOA34PEhz__CDMozax1iI_t8dzjDnh1x0iFSup7pSfW9iXk_WU3Dm74yWWW2jildY41vWgrEstuQ1dJ8vVFfSJ9T_tO4c-T9y8vDI8=.AQAB"},{"rel":"salmon","href":"https:\/\/kickass.zone\/main\/salmon\/user\/7477"},{"rel":"http:\/\/salmon-protocol.org\/ns\/salmon-replies","href":"https:\/\/kickass.zone\/main\/salmon\/user\/7477"},{"rel":"http:\/\/salmon-protocol.org\/ns\/salmon-mention","href":"https:\/\/kickass.zone\/main\/salmon\/user\/7477"},{"rel":"http:\/\/ostatus.org\/schema\/1.0\/subscribe","template":"https:\/\/kickass.zone\/main\/ostatussub?profile={uri}"}]} diff --git a/spec/fixtures/requests/webfinger.txt b/spec/fixtures/requests/webfinger.txt deleted file mode 100644 index d988c000..00000000 --- a/spec/fixtures/requests/webfinger.txt +++ /dev/null @@ -1,11 +0,0 @@ -HTTP/1.1 200 OK -Server: nginx/1.6.2 -Date: Sun, 20 Mar 2016 11:13:16 GMT -Content-Type: application/jrd+json -Transfer-Encoding: chunked -Connection: keep-alive -Access-Control-Allow-Origin: * -Vary: Accept-Encoding,Cookie -Strict-Transport-Security: max-age=31536000; includeSubdomains; - -{"subject":"acct:robcolbert@quitter.no","aliases":["https:\/\/quitter.no\/user\/7477","https:\/\/quitter.no\/robcolbert","https:\/\/quitter.no\/index.php\/user\/7477","https:\/\/quitter.no\/index.php\/robcolbert"],"links":[{"rel":"http:\/\/webfinger.net\/rel\/profile-page","type":"text\/html","href":"https:\/\/quitter.no\/robcolbert"},{"rel":"http:\/\/gmpg.org\/xfn\/11","type":"text\/html","href":"https:\/\/quitter.no\/robcolbert"},{"rel":"describedby","type":"application\/rdf+xml","href":"https:\/\/quitter.no\/robcolbert\/foaf"},{"rel":"http:\/\/apinamespace.org\/atom","type":"application\/atomsvc+xml","href":"https:\/\/quitter.no\/api\/statusnet\/app\/service\/robcolbert.xml"},{"rel":"http:\/\/apinamespace.org\/twitter","href":"https:\/\/quitter.no\/api\/"},{"rel":"http:\/\/specs.openid.net\/auth\/2.0\/provider","href":"https:\/\/quitter.no\/robcolbert"},{"rel":"http:\/\/schemas.google.com\/g\/2010#updates-from","type":"application\/atom+xml","href":"https:\/\/quitter.no\/api\/statuses\/user_timeline\/7477.atom"},{"rel":"magic-public-key","href":"data:application\/magic-public-key,RSA.1ZBkHTavLvxH3FzlKv4O6WtlILKRFfNami3_Rcu8EuogtXSYiS-bB6hElZfUCSHbC4uLemOA34PEhz__CDMozax1iI_t8dzjDnh1x0iFSup7pSfW9iXk_WU3Dm74yWWW2jildY41vWgrEstuQ1dJ8vVFfSJ9T_tO4c-T9y8vDI8=.AQAB"},{"rel":"salmon","href":"https:\/\/quitter.no\/main\/salmon\/user\/7477"},{"rel":"http:\/\/salmon-protocol.org\/ns\/salmon-replies","href":"https:\/\/quitter.no\/main\/salmon\/user\/7477"},{"rel":"http:\/\/salmon-protocol.org\/ns\/salmon-mention","href":"https:\/\/quitter.no\/main\/salmon\/user\/7477"},{"rel":"http:\/\/ostatus.org\/schema\/1.0\/subscribe","template":"https:\/\/quitter.no\/main\/ostatussub?profile={uri}"}]} \ No newline at end of file diff --git a/spec/fixtures/requests/windows-1251.txt b/spec/fixtures/requests/windows-1251.txt deleted file mode 100644 index f573e28b..00000000 --- a/spec/fixtures/requests/windows-1251.txt +++ /dev/null @@ -1,17 +0,0 @@ -HTTP/1.1 200 OK -server: nginx -date: Wed, 12 Dec 2018 13:14:03 GMT -content-type: text/html -content-length: 190 -accept-ranges: bytes - - - - - -
ñýìïë òåêñò
- - diff --git a/spec/fixtures/salmon/mention.xml b/spec/fixtures/salmon/mention.xml deleted file mode 100644 index 4d387ad8..00000000 --- a/spec/fixtures/salmon/mention.xml +++ /dev/null @@ -1,2 +0,0 @@ - -<script>alert("Hello")</script>
' - end - end - - context 'given text containing HTML (XSS attack)' do - let(:text) { %q{<img src="javascript:alert('XSS');">
' - end - end - - context 'given an invalid URL' do - let(:text) { 'http://www\.google\.com' } - - it 'outputs the raw URL' do - is_expected.to eq 'http://www\.google\.com
' - end - end - - context 'given text containing a hashtag' do - let(:text) { '#hashtag' } - - it 'creates a hashtag link' do - is_expected.to include '/tags/hashtag" class="mention hashtag" rel="tag">#hashtag' - end - end - - context 'given text containing a hashtag with Unicode chars' do - let(:text) { '#hashtagã‚¿ã‚°' } - - it 'creates a hashtag link' do - is_expected.to include '/tags/hashtag%E3%82%BF%E3%82%B0" class="mention hashtag" rel="tag">#hashtagã‚¿ã‚°' - end - end - end - - describe '#format_spoiler' do - subject { Formatter.instance.format_spoiler(status) } - - context 'given a post containing plain text' do - let(:status) { Fabricate(:status, text: 'text', spoiler_text: 'Secret!', uri: nil) } - - it 'Returns the spoiler text' do - is_expected.to eq 'Secret!' - end - end - - context 'given a post with an emoji shortcode at the start' do - let!(:emoji) { Fabricate(:custom_emoji) } - let(:status) { Fabricate(:status, text: 'text', spoiler_text: ':coolcat: Secret!', uri: nil) } - let(:text) { ':coolcat: Beep boop' } - - it 'converts the shortcode to an image tag' do - is_expected.to match(/text
' - end - end - - context 'given a post containing line feeds' do - let(:status) { Fabricate(:status, text: "line\nfeed", uri: nil) } - - it 'removes line feeds' do - is_expected.not_to include "\n" - end - end - - context 'given a post containing linkable mentions' do - let(:status) { Fabricate(:status, mentions: [ Fabricate(:mention, account: local_account) ], text: '@alice') } - - it 'creates a mention link' do - is_expected.to include '@alice' - end - end - - context 'given a post containing unlinkable mentions' do - let(:status) { Fabricate(:status, text: '@alice', uri: nil) } - - it 'does not create a mention link' do - is_expected.to include '@alice' - end - end - - context do - subject do - status = Fabricate(:status, text: text, uri: nil) - Formatter.instance.format(status) - end - - include_examples 'encode and link URLs' - end - - context 'given a post with custom_emojify option' do - let!(:emoji) { Fabricate(:custom_emoji) } - let(:status) { Fabricate(:status, account: local_account, text: text) } - - subject { Formatter.instance.format(status, custom_emojify: true) } - - context 'given a post with an emoji shortcode at the start' do - let(:text) { ':coolcat: Beep boop' } - - it 'converts the shortcode to an image tag' do - is_expected.to match(/:coolcat: Beep boop
' }
-
- it 'converts the shortcode to an image tag' do
- is_expected.to match(/
Beep :coolcat: boop
:coolcat::coolcat:<\/p>/) - end - end - - context 'given a post with an emoji shortcode at the end' do - let(:text) { '
Beep boop
:coolcat:
a text by a nerd who uses an HTML tag in text
', uri: nil) } - - it 'returns the raw text' do - is_expected.to eq 'a text by a nerd who uses an HTML tag in text
' - end - end - - context 'given a post with remote status' do - let(:status) { Fabricate(:status, account: remote_account, text: '') } - - it 'returns tag-stripped text' do - is_expected.to eq '' - end - end - end - - describe '#simplified_format' do - subject { Formatter.instance.simplified_format(account) } - - context 'given a post with local status' do - let(:account) { Fabricate(:account, domain: nil, note: text) } - - context 'given a post containing linkable mentions for local accounts' do - let(:text) { '@alice' } - - before { local_account } - - it 'creates a mention link' do - is_expected.to eq '' - end - end - - context 'given a post containing linkable mentions for remote accounts' do - let(:text) { '@bob@remote.test' } - - before { remote_account } - - it 'creates a mention link' do - is_expected.to eq '' - end - end - - context 'given a post containing unlinkable mentions' do - let(:text) { '@alice' } - - it 'does not create a mention link' do - is_expected.to eq '@alice
' - end - end - - context 'given a post with custom_emojify option' do - let!(:emoji) { Fabricate(:custom_emoji) } - - before { account.note = text } - subject { Formatter.instance.simplified_format(account, custom_emojify: true) } - - context 'given a post with an emoji shortcode at the start' do - let(:text) { ':coolcat: Beep boop' } - - it 'converts the shortcode to an image tag' do - is_expected.to match(/alert("Hello")' }
- let(:account) { Fabricate(:account, domain: 'remote', note: text) }
-
- it 'reformats' do
- is_expected.to_not include ''
- end
-
- context 'with custom_emojify option' do
- let!(:emoji) { Fabricate(:custom_emoji, domain: remote_account.domain) }
-
- before { remote_account.note = text }
-
- subject { Formatter.instance.simplified_format(remote_account, custom_emojify: true) }
-
- context 'given a post with an emoji shortcode at the start' do
- let(:text) { '
:coolcat: Beep boop
' }
-
- it 'converts shortcode to image tag' do
- is_expected.to match(/
Beep :coolcat: boop
:coolcat::coolcat:<\/p>/) - end - end - - context 'given a post with an emoji shortcode at the end' do - let(:text) { '
Beep boop
:coolcat:
text
' - end - - it 'appends link elements for mentioned accounts' do - account = Fabricate(:account, username: 'username') - status = Fabricate(:status) - Fabricate(:mention, account: account, status: status) - - element = serialize(status) - - mentioned = element.nodes.find do |node| - node.name == 'link' && - node[:rel] == 'mentioned' && - node['ostatus:object-type'] == OStatus::TagManager::TYPES[:person] - end - - expect(mentioned[:href]).to eq 'https://cb6e6126.ngrok.io/users/username' - end - - it 'appends link elements for emojis' do - Fabricate(:custom_emoji) - - status = Fabricate(:status, text: ':coolcat:') - element = serialize(status) - emoji = element.nodes.find { |node| node.name == 'link' && node[:rel] == 'emoji' } - - expect(emoji[:name]).to eq 'coolcat' - expect(emoji[:href]).to_not be_blank - end - end - - describe 'render' do - it 'returns XML with emojis' do - element = Ox::Element.new('tag') - element << '💩' - xml = OStatus::AtomSerializer.render(element) - - expect(xml).to eq "\nnote
') - - author = OStatus::AtomSerializer.new.author(account) - - note = author.nodes.find { |node| node.name == 'poco:note' } - expect(note.text).to eq 'note
' - end - - it 'appends poco:note element with tags-stripped note for remote account' do - account = Fabricate(:account, domain: 'remote', note: 'note
') - - author = OStatus::AtomSerializer.new.author(account) - - note = author.nodes.find { |node| node.name == 'poco:note' } - expect(note.text).to eq 'note' - end - - it 'appends summary element with type attribute and simplified note if present' do - account = Fabricate(:account, note: 'note') - author = OStatus::AtomSerializer.new.author(account) - expect(author.summary.text).to eq 'note
' - expect(author.summary[:type]).to eq 'html' - end - end - - context 'when note is not present' do - it 'does not append poco:note element' do - account = Fabricate(:account, note: '') - author = OStatus::AtomSerializer.new.author(account) - author.nodes.each { |node| expect(node.name).not_to eq 'poco:note' } - end - - it 'does not append summary element' do - account = Fabricate(:account, note: '') - author = OStatus::AtomSerializer.new.author(account) - author.nodes.each { |node| expect(node.name).not_to eq 'summary' } - end - end - - it 'returns author element' do - account = Fabricate(:account) - author = OStatus::AtomSerializer.new.author(account) - expect(author.name).to eq 'author' - end - - it 'appends activity:object-type element with person type' do - account = Fabricate(:account, domain: nil, username: 'username') - - author = OStatus::AtomSerializer.new.author(account) - - object_type = author.nodes.find { |node| node.name == 'activity:object-type' } - expect(object_type.text).to eq OStatus::TagManager::TYPES[:person] - end - - it 'appends email element with username and domain for local account' do - account = Fabricate(:account, username: 'username') - author = OStatus::AtomSerializer.new.author(account) - expect(author.email.text).to eq 'username@cb6e6126.ngrok.io' - end - - it 'appends email element with username and domain for remote user' do - account = Fabricate(:account, domain: 'domain', username: 'username') - author = OStatus::AtomSerializer.new.author(account) - expect(author.email.text).to eq 'username@domain' - end - - it 'appends link element for an alternative' do - account = Fabricate(:account, domain: nil, username: 'username') - - author = OStatus::AtomSerializer.new.author(account) - - link = author.nodes.find { |node| node.name == 'link' && node[:rel] == 'alternate' && node[:type] == 'text/html' } - expect(link[:type]).to eq 'text/html' - expect(link[:rel]).to eq 'alternate' - expect(link[:href]).to eq 'https://cb6e6126.ngrok.io/@username' - end - - it 'has link element for avatar if present' do - account = Fabricate(:account, avatar: attachment_fixture('avatar.gif')) - - author = OStatus::AtomSerializer.new.author(account) - - link = author.nodes.find { |node| node.name == 'link' && node[:rel] == 'avatar' } - expect(link[:type]).to eq 'image/gif' - expect(link['media:width']).to eq '120' - expect(link['media:height']).to eq '120' - expect(link[:href]).to match /^https:\/\/cb6e6126.ngrok.io\/system\/accounts\/avatars\/.+\/original\/avatar.gif/ - end - - it 'does not have link element for avatar if not present' do - account = Fabricate(:account, avatar: nil) - - author = OStatus::AtomSerializer.new.author(account) - - author.nodes.each do |node| - expect(node[:rel]).not_to eq 'avatar' if node.name == 'link' - end - end - - it 'appends link element for header if present' do - account = Fabricate(:account, header: attachment_fixture('avatar.gif')) - - author = OStatus::AtomSerializer.new.author(account) - - link = author.nodes.find { |node| node.name == 'link' && node[:rel] == 'header' } - expect(link[:type]).to eq 'image/gif' - expect(link['media:width']).to eq '700' - expect(link['media:height']).to eq '335' - expect(link[:href]).to match /^https:\/\/cb6e6126.ngrok.io\/system\/accounts\/headers\/.+\/original\/avatar.gif/ - end - - it 'does not append link element for header if not present' do - account = Fabricate(:account, header: nil) - - author = OStatus::AtomSerializer.new.author(account) - - author.nodes.each do |node| - expect(node[:rel]).not_to eq 'header' if node.name == 'link' - end - end - - it 'appends poco:displayName element with display name if present' do - account = Fabricate(:account, display_name: 'display name') - - author = OStatus::AtomSerializer.new.author(account) - - display_name = author.nodes.find { |node| node.name == 'poco:displayName' } - expect(display_name.text).to eq 'display name' - end - - it 'does not append poco:displayName element with display name if not present' do - account = Fabricate(:account, display_name: '') - author = OStatus::AtomSerializer.new.author(account) - author.nodes.each { |node| expect(node.name).not_to eq 'poco:displayName' } - end - - it "appends gabsocial:scope element with 'private' if locked" do - account = Fabricate(:account, locked: true) - - author = OStatus::AtomSerializer.new.author(account) - - scope = author.nodes.find { |node| node.name == 'gabsocial:scope' } - expect(scope.text).to eq 'private' - end - - it "appends gabsocial:scope element with 'public' if unlocked" do - account = Fabricate(:account, locked: false) - - author = OStatus::AtomSerializer.new.author(account) - - scope = author.nodes.find { |node| node.name == 'gabsocial:scope' } - expect(scope.text).to eq 'public' - end - - it 'includes URI' do - account = Fabricate(:account, domain: nil, username: 'username') - - author = OStatus::AtomSerializer.new.author(account) - - expect(author.id.text).to eq 'https://cb6e6126.ngrok.io/users/username' - expect(author.uri.text).to eq 'https://cb6e6126.ngrok.io/users/username' - end - - it 'includes username' do - account = Fabricate(:account, username: 'username') - - author = OStatus::AtomSerializer.new.author(account) - - name = author.nodes.find { |node| node.name == 'name' } - username = author.nodes.find { |node| node.name == 'poco:preferredUsername' } - expect(name.text).to eq 'username' - expect(username.text).to eq 'username' - end - end - - describe '#entry' do - shared_examples 'not root' do - include_examples 'no namespaces' do - def serialize - subject - end - end - - it 'does not append author element' do - subject.nodes.each { |node| expect(node.name).not_to eq 'author' } - end - end - - context 'it is root' do - include_examples 'namespaces' do - def serialize - stream_entry = Fabricate(:stream_entry) - OStatus::AtomSerializer.new.entry(stream_entry, true) - end - end - - it 'appends author element' do - account = Fabricate(:account, username: 'username') - status = Fabricate(:status, account: account) - - entry = OStatus::AtomSerializer.new.entry(status.stream_entry, true) - - expect(entry.author.id.text).to eq 'https://cb6e6126.ngrok.io/users/username' - end - end - - context 'if status is present' do - include_examples 'status attributes' do - def serialize(status) - OStatus::AtomSerializer.new.entry(status.stream_entry, true) - end - end - - it 'appends link element for the public collection if status is publicly visible' do - status = Fabricate(:status, visibility: :public) - - entry = OStatus::AtomSerializer.new.entry(status.stream_entry) - - mentioned_person = entry.nodes.find do |node| - node.name == 'link' && - node[:rel] == 'mentioned' && - node['ostatus:object-type'] == OStatus::TagManager::TYPES[:collection] - end - expect(mentioned_person[:href]).to eq OStatus::TagManager::COLLECTIONS[:public] - end - - it 'does not append link element for the public collection if status is not publicly visible' do - status = Fabricate(:status, visibility: :private) - - entry = OStatus::AtomSerializer.new.entry(status.stream_entry) - - entry.nodes.each do |node| - if node.name == 'link' && - node[:rel] == 'mentioned' && - node['ostatus:object-type'] == OStatus::TagManager::TYPES[:collection] - expect(mentioned_collection[:href]).not_to eq OStatus::TagManager::COLLECTIONS[:public] - end - end - end - - it 'appends category elements for tags' do - tag = Fabricate(:tag, name: 'tag') - status = Fabricate(:status, tags: [ tag ]) - - entry = OStatus::AtomSerializer.new.entry(status.stream_entry) - - expect(entry.category[:term]).to eq 'tag' - end - - it 'appends link elements for media attachments' do - file = attachment_fixture('attachment.jpg') - media_attachment = Fabricate(:media_attachment, file: file) - status = Fabricate(:status, media_attachments: [ media_attachment ]) - - entry = OStatus::AtomSerializer.new.entry(status.stream_entry) - - enclosure = entry.nodes.find { |node| node.name == 'link' && node[:rel] == 'enclosure' } - expect(enclosure[:type]).to eq 'image/jpeg' - expect(enclosure[:href]).to match /^https:\/\/cb6e6126.ngrok.io\/system\/media_attachments\/files\/.+\/original\/attachment.jpg$/ - end - - it 'appends gabsocial:scope element with visibility' do - status = Fabricate(:status, visibility: :public) - - entry = OStatus::AtomSerializer.new.entry(status.stream_entry) - - scope = entry.nodes.find { |node| node.name == 'gabsocial:scope' } - expect(scope.text).to eq 'public' - end - - it 'returns element whose rendered view triggers creation when processed' do - remote_account = Account.create!(username: 'username') - remote_status = Fabricate(:status, account: remote_account, created_at: '2000-01-01T00:00:00Z') - - entry = OStatus::AtomSerializer.new.entry(remote_status.stream_entry, true) - entry.nodes.delete_if { |node| node[:type] == 'application/activity+json' } # Remove ActivityPub link to simplify test - xml = OStatus::AtomSerializer.render(entry).gsub('cb6e6126.ngrok.io', 'remote.test') - - remote_status.destroy! - remote_account.destroy! - - account = Account.create!( - domain: 'remote.test', - username: 'username', - last_webfingered_at: Time.now.utc - ) - - ProcessFeedService.new.call(xml, account) - - expect(Status.find_by(uri: "https://remote.test/users/#{remote_status.account.to_param}/statuses/#{remote_status.id}")).to be_instance_of Status - end - end - - context 'if status is not present' do - it 'appends content element saying status is deleted' do - status = Fabricate(:status) - status.destroy! - - entry = OStatus::AtomSerializer.new.entry(status.stream_entry) - - expect(entry.content.text).to eq 'Deleted status' - end - - it 'appends title element saying the status is deleted' do - account = Fabricate(:account, username: 'username') - status = Fabricate(:status, account: account) - status.destroy! - - entry = OStatus::AtomSerializer.new.entry(status.stream_entry) - - expect(entry.title.text).to eq 'username deleted status' - end - end - - context 'it is not root' do - let(:stream_entry) { Fabricate(:stream_entry) } - subject { OStatus::AtomSerializer.new.entry(stream_entry, false) } - include_examples 'not root' - end - - context 'without root parameter' do - let(:stream_entry) { Fabricate(:stream_entry) } - subject { OStatus::AtomSerializer.new.entry(stream_entry) } - include_examples 'not root' - end - - it 'returns entry element' do - stream_entry = Fabricate(:stream_entry) - entry = OStatus::AtomSerializer.new.entry(stream_entry) - expect(entry.name).to eq 'entry' - end - - it 'appends id element with unique tag' do - status = Fabricate(:status, reblog_of_id: nil, created_at: '2000-01-01T00:00:00Z') - - entry = OStatus::AtomSerializer.new.entry(status.stream_entry) - - expect(entry.id.text).to eq "https://cb6e6126.ngrok.io/users/#{status.account.to_param}/statuses/#{status.id}" - end - - it 'appends published element with created date' do - stream_entry = Fabricate(:stream_entry, created_at: '2000-01-01T00:00:00Z') - entry = OStatus::AtomSerializer.new.entry(stream_entry) - expect(entry.published.text).to eq '2000-01-01T00:00:00Z' - end - - it 'appends updated element with updated date' do - stream_entry = Fabricate(:stream_entry, updated_at: '2000-01-01T00:00:00Z') - entry = OStatus::AtomSerializer.new.entry(stream_entry) - expect(entry.updated.text).to eq '2000-01-01T00:00:00Z' - end - - it 'appends title element with status title' do - account = Fabricate(:account, username: 'username') - status = Fabricate(:status, account: account, reblog_of_id: nil) - entry = OStatus::AtomSerializer.new.entry(status.stream_entry) - expect(entry.title.text).to eq 'New status by username' - end - - it 'appends activity:object-type element with object type' do - status = Fabricate(:status) - entry = OStatus::AtomSerializer.new.entry(status.stream_entry) - object_type = entry.nodes.find { |node| node.name == 'activity:object-type' } - expect(object_type.text).to eq OStatus::TagManager::TYPES[:note] - end - - it 'appends activity:verb element with object type' do - status = Fabricate(:status) - - entry = OStatus::AtomSerializer.new.entry(status.stream_entry) - - object_type = entry.nodes.find { |node| node.name == 'activity:verb' } - expect(object_type.text).to eq OStatus::TagManager::VERBS[:post] - end - - it 'appends activity:object element with target if present' do - reblogged = Fabricate(:status, created_at: '2000-01-01T00:00:00Z') - reblog = Fabricate(:status, reblog: reblogged) - - entry = OStatus::AtomSerializer.new.entry(reblog.stream_entry) - - object = entry.nodes.find { |node| node.name == 'activity:object' } - expect(object.id.text).to eq "https://cb6e6126.ngrok.io/users/#{reblogged.account.to_param}/statuses/#{reblogged.id}" - end - - it 'does not append activity:object element if target is not present' do - status = Fabricate(:status, reblog_of_id: nil) - entry = OStatus::AtomSerializer.new.entry(status.stream_entry) - entry.nodes.each { |node| expect(node.name).not_to eq 'activity:object' } - end - - it 'appends link element for an alternative' do - account = Fabricate(:account, username: 'username') - status = Fabricate(:status, account: account) - - entry = OStatus::AtomSerializer.new.entry(status.stream_entry) - - link = entry.nodes.find { |node| node.name == 'link' && node[:rel] == 'alternate' && node[:type] == 'text/html' } - expect(link[:type]).to eq 'text/html' - expect(link[:href]).to eq "https://cb6e6126.ngrok.io/@username/#{status.id}" - end - - it 'appends link element for itself' do - account = Fabricate(:account, username: 'username') - status = Fabricate(:status, account: account) - - entry = OStatus::AtomSerializer.new.entry(status.stream_entry) - - link = entry.nodes.find { |node| node.name == 'link' && node[:rel] == 'self' } - expect(link[:type]).to eq 'application/atom+xml' - expect(link[:href]).to eq "https://cb6e6126.ngrok.io/users/username/updates/#{status.stream_entry.id}.atom" - end - - it 'appends thr:in-reply-to element if threaded' do - in_reply_to_status = Fabricate(:status, created_at: '2000-01-01T00:00:00Z', reblog_of_id: nil) - reply_status = Fabricate(:status, in_reply_to_id: in_reply_to_status.id) - - entry = OStatus::AtomSerializer.new.entry(reply_status.stream_entry) - - in_reply_to = entry.nodes.find { |node| node.name == 'thr:in-reply-to' } - expect(in_reply_to[:ref]).to eq "https://cb6e6126.ngrok.io/users/#{in_reply_to_status.account.to_param}/statuses/#{in_reply_to_status.id}" - end - - it 'does not append thr:in-reply-to element if not threaded' do - status = Fabricate(:status) - entry = OStatus::AtomSerializer.new.entry(status.stream_entry) - entry.nodes.each { |node| expect(node.name).not_to eq 'thr:in-reply-to' } - end - - it 'appends ostatus:conversation if conversation id is present' do - status = Fabricate(:status) - status.conversation.update!(created_at: '2000-01-01T00:00:00Z') - - entry = OStatus::AtomSerializer.new.entry(status.stream_entry) - - conversation = entry.nodes.find { |node| node.name == 'ostatus:conversation' } - expect(conversation[:ref]).to eq "tag:cb6e6126.ngrok.io,2000-01-01:objectId=#{status.conversation_id}:objectType=Conversation" - end - - it 'does not append ostatus:conversation if conversation id is not present' do - status = Fabricate.build(:status, conversation_id: nil) - status.save!(validate: false) - - entry = OStatus::AtomSerializer.new.entry(status.stream_entry) - - entry.nodes.each { |node| expect(node.name).not_to eq 'ostatus:conversation' } - end - end - - describe '#feed' do - include_examples 'namespaces' do - def serialize - account = Fabricate(:account) - OStatus::AtomSerializer.new.feed(account, []) - end - end - - it 'returns feed element' do - account = Fabricate(:account) - feed = OStatus::AtomSerializer.new.feed(account, []) - expect(feed.name).to eq 'feed' - end - - it 'appends id element with account Atom URL' do - account = Fabricate(:account, username: 'username') - feed = OStatus::AtomSerializer.new.feed(account, []) - expect(feed.id.text).to eq 'https://cb6e6126.ngrok.io/users/username.atom' - end - - it 'appends title element with account display name if present' do - account = Fabricate(:account, display_name: 'display name') - feed = OStatus::AtomSerializer.new.feed(account, []) - expect(feed.title.text).to eq 'display name' - end - - it 'does not append title element with account username if account display name is not present' do - account = Fabricate(:account, display_name: '', username: 'username') - feed = OStatus::AtomSerializer.new.feed(account, []) - expect(feed.title.text).to eq 'username' - end - - it 'appends subtitle element with account note' do - account = Fabricate(:account, note: 'note') - feed = OStatus::AtomSerializer.new.feed(account, []) - expect(feed.subtitle.text).to eq 'note' - end - - it 'appends updated element with date account got updated' do - account = Fabricate(:account, updated_at: '2000-01-01T00:00:00Z') - feed = OStatus::AtomSerializer.new.feed(account, []) - expect(feed.updated.text).to eq '2000-01-01T00:00:00Z' - end - - it 'appends logo element with full asset URL for original account avatar' do - account = Fabricate(:account, avatar: attachment_fixture('avatar.gif')) - feed = OStatus::AtomSerializer.new.feed(account, []) - expect(feed.logo.text).to match /^https:\/\/cb6e6126.ngrok.io\/system\/accounts\/avatars\/.+\/original\/avatar.gif/ - end - - it 'appends author element' do - account = Fabricate(:account, username: 'username') - feed = OStatus::AtomSerializer.new.feed(account, []) - expect(feed.author.id.text).to eq 'https://cb6e6126.ngrok.io/users/username' - end - - it 'appends link element for an alternative' do - account = Fabricate(:account, username: 'username') - - feed = OStatus::AtomSerializer.new.feed(account, []) - - link = feed.nodes.find { |node| node.name == 'link' && node[:rel] == 'alternate' && node[:type] == 'text/html' } - expect(link[:type]).to eq 'text/html' - expect(link[:href]).to eq 'https://cb6e6126.ngrok.io/@username' - end - - it 'appends link element for itself' do - account = Fabricate(:account, username: 'username') - - feed = OStatus::AtomSerializer.new.feed(account, []) - - link = feed.nodes.find { |node| node.name == 'link' && node[:rel] == 'self' } - expect(link[:type]).to eq 'application/atom+xml' - expect(link[:href]).to eq 'https://cb6e6126.ngrok.io/users/username.atom' - end - - it 'appends link element for the next if it has 20 stream entries' do - account = Fabricate(:account, username: 'username') - stream_entry = Fabricate(:stream_entry) - - feed = OStatus::AtomSerializer.new.feed(account, Array.new(20, stream_entry)) - - link = feed.nodes.find { |node| node.name == 'link' && node[:rel] == 'next' } - expect(link[:type]).to eq 'application/atom+xml' - expect(link[:href]).to eq "https://cb6e6126.ngrok.io/users/username.atom?max_id=#{stream_entry.id}" - end - - it 'does not append link element for the next if it does not have 20 stream entries' do - account = Fabricate(:account, username: 'username') - - feed = OStatus::AtomSerializer.new.feed(account, []) - - feed.nodes.each do |node| - expect(node[:rel]).not_to eq 'next' if node.name == 'link' - end - end - - it 'appends link element for hub' do - account = Fabricate(:account, username: 'username') - - feed = OStatus::AtomSerializer.new.feed(account, []) - - link = feed.nodes.find { |node| node.name == 'link' && node[:rel] == 'hub' } - expect(link[:href]).to eq 'https://cb6e6126.ngrok.io/api/push' - end - - it 'appends link element for Salmon' do - account = Fabricate(:account, username: 'username') - - feed = OStatus::AtomSerializer.new.feed(account, []) - - link = feed.nodes.find { |node| node.name == 'link' && node[:rel] == 'salmon' } - expect(link[:href]).to start_with 'https://cb6e6126.ngrok.io/api/salmon/' - end - - it 'appends stream entries' do - account = Fabricate(:account, username: 'username') - status = Fabricate(:status, account: account) - - feed = OStatus::AtomSerializer.new.feed(account, [status.stream_entry]) - - expect(feed.entry.title.text).to eq 'New status by username' - end - end - - describe '#block_salmon' do - include_examples 'namespaces' do - def serialize - block = Fabricate(:block) - OStatus::AtomSerializer.new.block_salmon(block) - end - end - - it 'returns entry element' do - block = Fabricate(:block) - block_salmon = OStatus::AtomSerializer.new.block_salmon(block) - expect(block_salmon.name).to eq 'entry' - end - - it 'appends id element with unique tag' do - block = Fabricate(:block) - - time_before = Time.zone.now - block_salmon = OStatus::AtomSerializer.new.block_salmon(block) - time_after = Time.zone.now - - expect(block_salmon.id.text).to( - eq(OStatus::TagManager.instance.unique_tag(time_before.utc, block.id, 'Block')) - .or(eq(OStatus::TagManager.instance.unique_tag(time_after.utc, block.id, 'Block'))) - ) - end - - it 'appends title element with description' do - account = Fabricate(:account, domain: nil, username: 'account') - target_account = Fabricate(:account, domain: 'remote', username: 'target_account') - block = Fabricate(:block, account: account, target_account: target_account) - - block_salmon = OStatus::AtomSerializer.new.block_salmon(block) - - expect(block_salmon.title.text).to eq 'account no longer wishes to interact with target_account@remote' - end - - it 'appends author element with account' do - account = Fabricate(:account, domain: nil, username: 'account') - block = Fabricate(:block, account: account) - - block_salmon = OStatus::AtomSerializer.new.block_salmon(block) - - expect(block_salmon.author.id.text).to eq 'https://cb6e6126.ngrok.io/users/account' - end - - it 'appends activity:object-type element with activity type' do - block = Fabricate(:block) - - block_salmon = OStatus::AtomSerializer.new.block_salmon(block) - - object_type = block_salmon.nodes.find { |node| node.name == 'activity:object-type' } - expect(object_type.text).to eq OStatus::TagManager::TYPES[:activity] - end - - it 'appends activity:verb element with block' do - block = Fabricate(:block) - - block_salmon = OStatus::AtomSerializer.new.block_salmon(block) - - verb = block_salmon.nodes.find { |node| node.name == 'activity:verb' } - expect(verb.text).to eq OStatus::TagManager::VERBS[:block] - end - - it 'appends activity:object element with target account' do - target_account = Fabricate(:account, domain: 'domain.test', uri: 'https://domain.test/id') - block = Fabricate(:block, target_account: target_account) - - block_salmon = OStatus::AtomSerializer.new.block_salmon(block) - - object = block_salmon.nodes.find { |node| node.name == 'activity:object' } - expect(object.id.text).to eq 'https://domain.test/id' - end - - it 'returns element whose rendered view triggers block when processed' do - block = Fabricate(:block) - block_salmon = OStatus::AtomSerializer.new.block_salmon(block) - xml = OStatus::AtomSerializer.render(block_salmon) - envelope = OStatus2::Salmon.new.pack(xml, block.account.keypair) - block.destroy! - - ProcessInteractionService.new.call(envelope, block.target_account) - - expect(block.account.blocking?(block.target_account)).to be true - end - end - - describe '#unblock_salmon' do - include_examples 'namespaces' do - def serialize - block = Fabricate(:block) - OStatus::AtomSerializer.new.unblock_salmon(block) - end - end - - it 'returns entry element' do - block = Fabricate(:block) - unblock_salmon = OStatus::AtomSerializer.new.unblock_salmon(block) - expect(unblock_salmon.name).to eq 'entry' - end - - it 'appends id element with unique tag' do - block = Fabricate(:block) - - time_before = Time.zone.now - unblock_salmon = OStatus::AtomSerializer.new.unblock_salmon(block) - time_after = Time.zone.now - - expect(unblock_salmon.id.text).to( - eq(OStatus::TagManager.instance.unique_tag(time_before.utc, block.id, 'Block')) - .or(eq(OStatus::TagManager.instance.unique_tag(time_after.utc, block.id, 'Block'))) - ) - end - - it 'appends title element with description' do - account = Fabricate(:account, domain: nil, username: 'account') - target_account = Fabricate(:account, domain: 'remote', username: 'target_account') - block = Fabricate(:block, account: account, target_account: target_account) - - unblock_salmon = OStatus::AtomSerializer.new.unblock_salmon(block) - - expect(unblock_salmon.title.text).to eq 'account no longer blocks target_account@remote' - end - - it 'appends author element with account' do - account = Fabricate(:account, domain: nil, username: 'account') - block = Fabricate(:block, account: account) - - unblock_salmon = OStatus::AtomSerializer.new.unblock_salmon(block) - - expect(unblock_salmon.author.id.text).to eq 'https://cb6e6126.ngrok.io/users/account' - end - - it 'appends activity:object-type element with activity type' do - block = Fabricate(:block) - - unblock_salmon = OStatus::AtomSerializer.new.unblock_salmon(block) - - object_type = unblock_salmon.nodes.find { |node| node.name == 'activity:object-type' } - expect(object_type.text).to eq OStatus::TagManager::TYPES[:activity] - end - - it 'appends activity:verb element with block' do - block = Fabricate(:block) - - unblock_salmon = OStatus::AtomSerializer.new.unblock_salmon(block) - - verb = unblock_salmon.nodes.find { |node| node.name == 'activity:verb' } - expect(verb.text).to eq OStatus::TagManager::VERBS[:unblock] - end - - it 'appends activity:object element with target account' do - target_account = Fabricate(:account, domain: 'domain.test', uri: 'https://domain.test/id') - block = Fabricate(:block, target_account: target_account) - - unblock_salmon = OStatus::AtomSerializer.new.unblock_salmon(block) - - object = unblock_salmon.nodes.find { |node| node.name == 'activity:object' } - expect(object.id.text).to eq 'https://domain.test/id' - end - - it 'returns element whose rendered view triggers block when processed' do - block = Fabricate(:block) - unblock_salmon = OStatus::AtomSerializer.new.unblock_salmon(block) - xml = OStatus::AtomSerializer.render(unblock_salmon) - envelope = OStatus2::Salmon.new.pack(xml, block.account.keypair) - - ProcessInteractionService.new.call(envelope, block.target_account) - - expect { block.reload }.to raise_error ActiveRecord::RecordNotFound - end - end - - describe '#favourite_salmon' do - include_examples 'namespaces' do - def serialize - favourite = Fabricate(:favourite) - OStatus::AtomSerializer.new.favourite_salmon(favourite) - end - end - - it 'returns entry element' do - favourite = Fabricate(:favourite) - favourite_salmon = OStatus::AtomSerializer.new.favourite_salmon(favourite) - expect(favourite_salmon.name).to eq 'entry' - end - - it 'appends id element with unique tag' do - favourite = Fabricate(:favourite, created_at: '2000-01-01T00:00:00Z') - favourite_salmon = OStatus::AtomSerializer.new.favourite_salmon(favourite) - expect(favourite_salmon.id.text).to eq "tag:cb6e6126.ngrok.io,2000-01-01:objectId=#{favourite.id}:objectType=Favourite" - end - - it 'appends author element with account' do - account = Fabricate(:account, domain: nil, username: 'username') - favourite = Fabricate(:favourite, account: account) - - favourite_salmon = OStatus::AtomSerializer.new.favourite_salmon(favourite) - - expect(favourite_salmon.author.id.text).to eq 'https://cb6e6126.ngrok.io/users/username' - end - - it 'appends activity:object-type element with activity type' do - favourite = Fabricate(:favourite) - - favourite_salmon = OStatus::AtomSerializer.new.favourite_salmon(favourite) - - object_type = favourite_salmon.nodes.find { |node| node.name == 'activity:object-type' } - expect(object_type.text).to eq 'http://activitystrea.ms/schema/1.0/activity' - end - - it 'appends activity:verb element with favorite' do - favourite = Fabricate(:favourite) - - favourite_salmon = OStatus::AtomSerializer.new.favourite_salmon(favourite) - - verb = favourite_salmon.nodes.find { |node| node.name == 'activity:verb' } - expect(verb.text).to eq OStatus::TagManager::VERBS[:favorite] - end - - it 'appends activity:object element with status' do - status = Fabricate(:status, created_at: '2000-01-01T00:00:00Z') - favourite = Fabricate(:favourite, status: status) - - favourite_salmon = OStatus::AtomSerializer.new.favourite_salmon(favourite) - - object = favourite_salmon.nodes.find { |node| node.name == 'activity:object' } - expect(object.id.text).to eq "https://cb6e6126.ngrok.io/users/#{status.account.to_param}/statuses/#{status.id}" - end - - it 'appends thr:in-reply-to element for status' do - status_account = Fabricate(:account, username: 'username') - status = Fabricate(:status, account: status_account, created_at: '2000-01-01T00:00:00Z') - favourite = Fabricate(:favourite, status: status) - - favourite_salmon = OStatus::AtomSerializer.new.favourite_salmon(favourite) - - in_reply_to = favourite_salmon.nodes.find { |node| node.name == 'thr:in-reply-to' } - expect(in_reply_to.ref).to eq "https://cb6e6126.ngrok.io/users/#{status.account.to_param}/statuses/#{status.id}" - expect(in_reply_to.href).to eq "https://cb6e6126.ngrok.io/@username/#{status.id}" - end - - it 'includes description' do - account = Fabricate(:account, domain: nil, username: 'account') - status_account = Fabricate(:account, domain: 'remote', username: 'status_account') - status = Fabricate(:status, account: status_account) - favourite = Fabricate(:favourite, account: account, status: status) - - favourite_salmon = OStatus::AtomSerializer.new.favourite_salmon(favourite) - - expect(favourite_salmon.title.text).to eq 'account favourited a status by status_account@remote' - expect(favourite_salmon.content.text).to eq 'account favourited a status by status_account@remote' - end - - it 'returns element whose rendered view triggers favourite when processed' do - favourite = Fabricate(:favourite) - favourite_salmon = OStatus::AtomSerializer.new.favourite_salmon(favourite) - xml = OStatus::AtomSerializer.render(favourite_salmon) - envelope = OStatus2::Salmon.new.pack(xml, favourite.account.keypair) - favourite.destroy! - - ProcessInteractionService.new.call(envelope, favourite.status.account) - expect(favourite.account.favourited?(favourite.status)).to be true - end - end - - describe '#unfavourite_salmon' do - include_examples 'namespaces' do - def serialize - favourite = Fabricate(:favourite) - OStatus::AtomSerializer.new.favourite_salmon(favourite) - end - end - - it 'returns entry element' do - favourite = Fabricate(:favourite) - unfavourite_salmon = OStatus::AtomSerializer.new.unfavourite_salmon(favourite) - expect(unfavourite_salmon.name).to eq 'entry' - end - - it 'appends id element with unique tag' do - favourite = Fabricate(:favourite) - - time_before = Time.zone.now - unfavourite_salmon = OStatus::AtomSerializer.new.unfavourite_salmon(favourite) - time_after = Time.zone.now - - expect(unfavourite_salmon.id.text).to( - eq(OStatus::TagManager.instance.unique_tag(time_before.utc, favourite.id, 'Favourite')) - .or(eq(OStatus::TagManager.instance.unique_tag(time_after.utc, favourite.id, 'Favourite'))) - ) - end - - it 'appends author element with account' do - account = Fabricate(:account, domain: nil, username: 'username') - favourite = Fabricate(:favourite, account: account) - - unfavourite_salmon = OStatus::AtomSerializer.new.unfavourite_salmon(favourite) - - expect(unfavourite_salmon.author.id.text).to eq 'https://cb6e6126.ngrok.io/users/username' - end - - it 'appends activity:object-type element with activity type' do - favourite = Fabricate(:favourite) - - unfavourite_salmon = OStatus::AtomSerializer.new.unfavourite_salmon(favourite) - - object_type = unfavourite_salmon.nodes.find { |node| node.name == 'activity:object-type' } - expect(object_type.text).to eq 'http://activitystrea.ms/schema/1.0/activity' - end - - it 'appends activity:verb element with favorite' do - favourite = Fabricate(:favourite) - - unfavourite_salmon = OStatus::AtomSerializer.new.unfavourite_salmon(favourite) - - verb = unfavourite_salmon.nodes.find { |node| node.name == 'activity:verb' } - expect(verb.text).to eq OStatus::TagManager::VERBS[:unfavorite] - end - - it 'appends activity:object element with status' do - status = Fabricate(:status, created_at: '2000-01-01T00:00:00Z') - favourite = Fabricate(:favourite, status: status) - - unfavourite_salmon = OStatus::AtomSerializer.new.unfavourite_salmon(favourite) - - object = unfavourite_salmon.nodes.find { |node| node.name == 'activity:object' } - expect(object.id.text).to eq "https://cb6e6126.ngrok.io/users/#{status.account.to_param}/statuses/#{status.id}" - end - - it 'appends thr:in-reply-to element for status' do - status_account = Fabricate(:account, username: 'username') - status = Fabricate(:status, account: status_account, created_at: '2000-01-01T00:00:00Z') - favourite = Fabricate(:favourite, status: status) - - unfavourite_salmon = OStatus::AtomSerializer.new.unfavourite_salmon(favourite) - - in_reply_to = unfavourite_salmon.nodes.find { |node| node.name == 'thr:in-reply-to' } - expect(in_reply_to.ref).to eq "https://cb6e6126.ngrok.io/users/#{status.account.to_param}/statuses/#{status.id}" - expect(in_reply_to.href).to eq "https://cb6e6126.ngrok.io/@username/#{status.id}" - end - - it 'includes description' do - account = Fabricate(:account, domain: nil, username: 'account') - status_account = Fabricate(:account, domain: 'remote', username: 'status_account') - status = Fabricate(:status, account: status_account) - favourite = Fabricate(:favourite, account: account, status: status) - - unfavourite_salmon = OStatus::AtomSerializer.new.unfavourite_salmon(favourite) - - expect(unfavourite_salmon.title.text).to eq 'account no longer favourites a status by status_account@remote' - expect(unfavourite_salmon.content.text).to eq 'account no longer favourites a status by status_account@remote' - end - - it 'returns element whose rendered view triggers unfavourite when processed' do - favourite = Fabricate(:favourite) - unfavourite_salmon = OStatus::AtomSerializer.new.unfavourite_salmon(favourite) - xml = OStatus::AtomSerializer.render(unfavourite_salmon) - envelope = OStatus2::Salmon.new.pack(xml, favourite.account.keypair) - - ProcessInteractionService.new.call(envelope, favourite.status.account) - expect { favourite.reload }.to raise_error ActiveRecord::RecordNotFound - end - end - - describe '#follow_salmon' do - include_examples 'namespaces' do - def serialize - follow = Fabricate(:follow) - OStatus::AtomSerializer.new.follow_salmon(follow) - end - end - - it 'returns entry element' do - follow = Fabricate(:follow) - follow_salmon = OStatus::AtomSerializer.new.follow_salmon(follow) - expect(follow_salmon.name).to eq 'entry' - end - - it 'appends id element with unique tag' do - follow = Fabricate(:follow, created_at: '2000-01-01T00:00:00Z') - follow_salmon = OStatus::AtomSerializer.new.follow_salmon(follow) - expect(follow_salmon.id.text).to eq "tag:cb6e6126.ngrok.io,2000-01-01:objectId=#{follow.id}:objectType=Follow" - end - - it 'appends author element with account' do - account = Fabricate(:account, domain: nil, username: 'username') - follow = Fabricate(:follow, account: account) - - follow_salmon = OStatus::AtomSerializer.new.follow_salmon(follow) - - expect(follow_salmon.author.id.text).to eq 'https://cb6e6126.ngrok.io/users/username' - end - - it 'appends activity:object-type element with activity type' do - follow = Fabricate(:follow) - - follow_salmon = OStatus::AtomSerializer.new.follow_salmon(follow) - - object_type = follow_salmon.nodes.find { |node| node.name == 'activity:object-type' } - expect(object_type.text).to eq OStatus::TagManager::TYPES[:activity] - end - - it 'appends activity:verb element with follow' do - follow = Fabricate(:follow) - - follow_salmon = OStatus::AtomSerializer.new.follow_salmon(follow) - - verb = follow_salmon.nodes.find { |node| node.name == 'activity:verb' } - expect(verb.text).to eq OStatus::TagManager::VERBS[:follow] - end - - it 'appends activity:object element with target account' do - target_account = Fabricate(:account, domain: 'domain.test', uri: 'https://domain.test/id') - follow = Fabricate(:follow, target_account: target_account) - - follow_salmon = OStatus::AtomSerializer.new.follow_salmon(follow) - - object = follow_salmon.nodes.find { |node| node.name == 'activity:object' } - expect(object.id.text).to eq 'https://domain.test/id' - end - - it 'includes description' do - account = Fabricate(:account, domain: nil, username: 'account') - target_account = Fabricate(:account, domain: 'remote', username: 'target_account') - follow = Fabricate(:follow, account: account, target_account: target_account) - - follow_salmon = OStatus::AtomSerializer.new.follow_salmon(follow) - - expect(follow_salmon.title.text).to eq 'account started following target_account@remote' - expect(follow_salmon.content.text).to eq 'account started following target_account@remote' - end - - it 'returns element whose rendered view triggers follow when processed' do - follow = Fabricate(:follow) - follow_salmon = OStatus::AtomSerializer.new.follow_salmon(follow) - xml = OStatus::AtomSerializer.render(follow_salmon) - follow.destroy! - envelope = OStatus2::Salmon.new.pack(xml, follow.account.keypair) - - ProcessInteractionService.new.call(envelope, follow.target_account) - - expect(follow.account.following?(follow.target_account)).to be true - end - end - - describe '#unfollow_salmon' do - include_examples 'namespaces' do - def serialize - follow = Fabricate(:follow) - follow.destroy! - OStatus::AtomSerializer.new.unfollow_salmon(follow) - end - end - - it 'returns entry element' do - follow = Fabricate(:follow) - follow.destroy! - - unfollow_salmon = OStatus::AtomSerializer.new.unfollow_salmon(follow) - - expect(unfollow_salmon.name).to eq 'entry' - end - - it 'appends id element with unique tag' do - follow = Fabricate(:follow) - follow.destroy! - - time_before = Time.zone.now - unfollow_salmon = OStatus::AtomSerializer.new.unfollow_salmon(follow) - time_after = Time.zone.now - - expect(unfollow_salmon.id.text).to( - eq(OStatus::TagManager.instance.unique_tag(time_before.utc, follow.id, 'Follow')) - .or(eq(OStatus::TagManager.instance.unique_tag(time_after.utc, follow.id, 'Follow'))) - ) - end - - it 'appends title element with description' do - account = Fabricate(:account, domain: nil, username: 'account') - target_account = Fabricate(:account, domain: 'remote', username: 'target_account') - follow = Fabricate(:follow, account: account, target_account: target_account) - follow.destroy! - - unfollow_salmon = OStatus::AtomSerializer.new.unfollow_salmon(follow) - - expect(unfollow_salmon.title.text).to eq 'account is no longer following target_account@remote' - end - - it 'appends content element with description' do - account = Fabricate(:account, domain: nil, username: 'account') - target_account = Fabricate(:account, domain: 'remote', username: 'target_account') - follow = Fabricate(:follow, account: account, target_account: target_account) - follow.destroy! - - unfollow_salmon = OStatus::AtomSerializer.new.unfollow_salmon(follow) - - expect(unfollow_salmon.content.text).to eq 'account is no longer following target_account@remote' - end - - it 'appends author element with account' do - account = Fabricate(:account, domain: nil, username: 'username') - follow = Fabricate(:follow, account: account) - follow.destroy! - - unfollow_salmon = OStatus::AtomSerializer.new.unfollow_salmon(follow) - - expect(unfollow_salmon.author.id.text).to eq 'https://cb6e6126.ngrok.io/users/username' - end - - it 'appends activity:object-type element with activity type' do - follow = Fabricate(:follow) - follow.destroy! - - unfollow_salmon = OStatus::AtomSerializer.new.unfollow_salmon(follow) - - object_type = unfollow_salmon.nodes.find { |node| node.name == 'activity:object-type' } - expect(object_type.text).to eq OStatus::TagManager::TYPES[:activity] - end - - it 'appends activity:verb element with follow' do - follow = Fabricate(:follow) - follow.destroy! - - unfollow_salmon = OStatus::AtomSerializer.new.unfollow_salmon(follow) - - verb = unfollow_salmon.nodes.find { |node| node.name == 'activity:verb' } - expect(verb.text).to eq OStatus::TagManager::VERBS[:unfollow] - end - - it 'appends activity:object element with target account' do - target_account = Fabricate(:account, domain: 'domain.test', uri: 'https://domain.test/id') - follow = Fabricate(:follow, target_account: target_account) - follow.destroy! - - unfollow_salmon = OStatus::AtomSerializer.new.unfollow_salmon(follow) - - object = unfollow_salmon.nodes.find { |node| node.name == 'activity:object' } - expect(object.id.text).to eq 'https://domain.test/id' - end - - it 'returns element whose rendered view triggers unfollow when processed' do - follow = Fabricate(:follow) - follow.destroy! - unfollow_salmon = OStatus::AtomSerializer.new.unfollow_salmon(follow) - xml = OStatus::AtomSerializer.render(unfollow_salmon) - follow.account.follow!(follow.target_account) - envelope = OStatus2::Salmon.new.pack(xml, follow.account.keypair) - - ProcessInteractionService.new.call(envelope, follow.target_account) - - expect(follow.account.following?(follow.target_account)).to be false - end - end - - describe '#follow_request_salmon' do - include_examples 'namespaces' do - def serialize - follow_request = Fabricate(:follow_request) - OStatus::AtomSerializer.new.follow_request_salmon(follow_request) - end - end - - context do - def serialize(follow_request) - OStatus::AtomSerializer.new.follow_request_salmon(follow_request) - end - - it_behaves_like 'follow request salmon' - - it 'appends id element with unique tag' do - follow_request = Fabricate(:follow_request, created_at: '2000-01-01T00:00:00Z') - follow_request_salmon = serialize(follow_request) - expect(follow_request_salmon.id.text).to eq "tag:cb6e6126.ngrok.io,2000-01-01:objectId=#{follow_request.id}:objectType=FollowRequest" - end - - it 'appends title element with description' do - account = Fabricate(:account, domain: nil, username: 'account') - target_account = Fabricate(:account, domain: 'remote', username: 'target_account') - follow_request = Fabricate(:follow_request, account: account, target_account: target_account) - follow_request_salmon = serialize(follow_request) - expect(follow_request_salmon.title.text).to eq 'account requested to follow target_account@remote' - end - - it 'returns element whose rendered view triggers follow request when processed' do - follow_request = Fabricate(:follow_request) - follow_request_salmon = serialize(follow_request) - xml = OStatus::AtomSerializer.render(follow_request_salmon) - envelope = OStatus2::Salmon.new.pack(xml, follow_request.account.keypair) - follow_request.destroy! - - ProcessInteractionService.new.call(envelope, follow_request.target_account) - - expect(follow_request.account.requested?(follow_request.target_account)).to eq true - end - end - end - - describe '#authorize_follow_request_salmon' do - include_examples 'namespaces' do - def serialize - follow_request = Fabricate(:follow_request) - OStatus::AtomSerializer.new.authorize_follow_request_salmon(follow_request) - end - end - - it_behaves_like 'follow request salmon' do - def serialize(follow_request) - authorize_follow_request_salmon = OStatus::AtomSerializer.new.authorize_follow_request_salmon(follow_request) - authorize_follow_request_salmon.nodes.find { |node| node.name == 'activity:object' } - end - end - - it 'appends id element with unique tag' do - follow_request = Fabricate(:follow_request) - - time_before = Time.zone.now - authorize_follow_request_salmon = OStatus::AtomSerializer.new.authorize_follow_request_salmon(follow_request) - time_after = Time.zone.now - - expect(authorize_follow_request_salmon.id.text).to( - eq(OStatus::TagManager.instance.unique_tag(time_before.utc, follow_request.id, 'FollowRequest')) - .or(eq(OStatus::TagManager.instance.unique_tag(time_after.utc, follow_request.id, 'FollowRequest'))) - ) - end - - it 'appends title element with description' do - account = Fabricate(:account, domain: 'remote', username: 'account') - target_account = Fabricate(:account, domain: nil, username: 'target_account') - follow_request = Fabricate(:follow_request, account: account, target_account: target_account) - - authorize_follow_request_salmon = OStatus::AtomSerializer.new.authorize_follow_request_salmon(follow_request) - - expect(authorize_follow_request_salmon.title.text).to eq 'target_account authorizes follow request by account@remote' - end - - it 'appends activity:object-type element with activity type' do - follow_request = Fabricate(:follow_request) - - authorize_follow_request_salmon = OStatus::AtomSerializer.new.authorize_follow_request_salmon(follow_request) - - object_type = authorize_follow_request_salmon.nodes.find { |node| node.name == 'activity:object-type' } - expect(object_type.text).to eq OStatus::TagManager::TYPES[:activity] - end - - it 'appends activity:verb element with authorize' do - follow_request = Fabricate(:follow_request) - - authorize_follow_request_salmon = OStatus::AtomSerializer.new.authorize_follow_request_salmon(follow_request) - - verb = authorize_follow_request_salmon.nodes.find { |node| node.name == 'activity:verb' } - expect(verb.text).to eq OStatus::TagManager::VERBS[:authorize] - end - - it 'returns element whose rendered view creates follow from follow request when processed' do - follow_request = Fabricate(:follow_request) - authorize_follow_request_salmon = OStatus::AtomSerializer.new.authorize_follow_request_salmon(follow_request) - xml = OStatus::AtomSerializer.render(authorize_follow_request_salmon) - envelope = OStatus2::Salmon.new.pack(xml, follow_request.target_account.keypair) - - ProcessInteractionService.new.call(envelope, follow_request.account) - - expect(follow_request.account.following?(follow_request.target_account)).to eq true - expect { follow_request.reload }.to raise_error ActiveRecord::RecordNotFound - end - end - - describe '#reject_follow_request_salmon' do - include_examples 'namespaces' do - def serialize - follow_request = Fabricate(:follow_request) - OStatus::AtomSerializer.new.reject_follow_request_salmon(follow_request) - end - end - - it_behaves_like 'follow request salmon' do - def serialize(follow_request) - reject_follow_request_salmon = OStatus::AtomSerializer.new.reject_follow_request_salmon(follow_request) - reject_follow_request_salmon.nodes.find { |node| node.name == 'activity:object' } - end - end - - it 'appends id element with unique tag' do - follow_request = Fabricate(:follow_request) - - time_before = Time.zone.now - reject_follow_request_salmon = OStatus::AtomSerializer.new.reject_follow_request_salmon(follow_request) - time_after = Time.zone.now - - expect(reject_follow_request_salmon.id.text).to( - eq(OStatus::TagManager.instance.unique_tag(time_before.utc, follow_request.id, 'FollowRequest')) - .or(OStatus::TagManager.instance.unique_tag(time_after.utc, follow_request.id, 'FollowRequest')) - ) - end - - it 'appends title element with description' do - account = Fabricate(:account, domain: 'remote', username: 'account') - target_account = Fabricate(:account, domain: nil, username: 'target_account') - follow_request = Fabricate(:follow_request, account: account, target_account: target_account) - reject_follow_request_salmon = OStatus::AtomSerializer.new.reject_follow_request_salmon(follow_request) - expect(reject_follow_request_salmon.title.text).to eq 'target_account rejects follow request by account@remote' - end - - it 'appends activity:object-type element with activity type' do - follow_request = Fabricate(:follow_request) - reject_follow_request_salmon = OStatus::AtomSerializer.new.reject_follow_request_salmon(follow_request) - object_type = reject_follow_request_salmon.nodes.find { |node| node.name == 'activity:object-type' } - expect(object_type.text).to eq OStatus::TagManager::TYPES[:activity] - end - - it 'appends activity:verb element with authorize' do - follow_request = Fabricate(:follow_request) - reject_follow_request_salmon = OStatus::AtomSerializer.new.reject_follow_request_salmon(follow_request) - verb = reject_follow_request_salmon.nodes.find { |node| node.name == 'activity:verb' } - expect(verb.text).to eq OStatus::TagManager::VERBS[:reject] - end - - it 'returns element whose rendered view deletes follow request when processed' do - follow_request = Fabricate(:follow_request) - reject_follow_request_salmon = OStatus::AtomSerializer.new.reject_follow_request_salmon(follow_request) - xml = OStatus::AtomSerializer.render(reject_follow_request_salmon) - envelope = OStatus2::Salmon.new.pack(xml, follow_request.target_account.keypair) - - ProcessInteractionService.new.call(envelope, follow_request.account) - - expect(follow_request.account.following?(follow_request.target_account)).to eq false - expect { follow_request.reload }.to raise_error ActiveRecord::RecordNotFound - end - end - - describe '#object' do - include_examples 'status attributes' do - def serialize(status) - OStatus::AtomSerializer.new.object(status) - end - end - - it 'returns activity:object element' do - status = Fabricate(:status) - object = OStatus::AtomSerializer.new.object(status) - expect(object.name).to eq 'activity:object' - end - - it 'appends id element with URL for status' do - status = Fabricate(:status, created_at: '2000-01-01T00:00:00Z') - object = OStatus::AtomSerializer.new.object(status) - expect(object.id.text).to eq "https://cb6e6126.ngrok.io/users/#{status.account.to_param}/statuses/#{status.id}" - end - - it 'appends published element with created date' do - status = Fabricate(:status, created_at: '2000-01-01T00:00:00Z') - object = OStatus::AtomSerializer.new.object(status) - expect(object.published.text).to eq '2000-01-01T00:00:00Z' - end - - it 'appends updated element with updated date' do - status = Fabricate(:status) - status.updated_at = '2000-01-01T00:00:00Z' - object = OStatus::AtomSerializer.new.object(status) - expect(object.updated.text).to eq '2000-01-01T00:00:00Z' - end - - it 'appends title element with title' do - account = Fabricate(:account, username: 'username') - status = Fabricate(:status, account: account) - - object = OStatus::AtomSerializer.new.object(status) - - expect(object.title.text).to eq 'New status by username' - end - - it 'appends author element with account' do - account = Fabricate(:account, username: 'username') - status = Fabricate(:status, account: account) - - entry = OStatus::AtomSerializer.new.object(status) - - expect(entry.author.id.text).to eq 'https://cb6e6126.ngrok.io/users/username' - end - - it 'appends activity:object-type element with object type' do - status = Fabricate(:status) - - entry = OStatus::AtomSerializer.new.object(status) - - object_type = entry.nodes.find { |node| node.name == 'activity:object-type' } - expect(object_type.text).to eq OStatus::TagManager::TYPES[:note] - end - - it 'appends activity:verb element with verb' do - status = Fabricate(:status) - - entry = OStatus::AtomSerializer.new.object(status) - - object_type = entry.nodes.find { |node| node.name == 'activity:verb' } - expect(object_type.text).to eq OStatus::TagManager::VERBS[:post] - end - - it 'appends link element for an alternative' do - account = Fabricate(:account, username: 'username') - status = Fabricate(:status, account: account) - - entry = OStatus::AtomSerializer.new.object(status) - - link = entry.nodes.find { |node| node.name == 'link' && node[:rel] == 'alternate' && node[:type] == 'text/html' } - expect(link[:type]).to eq 'text/html' - expect(link[:href]).to eq "https://cb6e6126.ngrok.io/@username/#{status.id}" - end - - it 'appends thr:in-reply-to element if it is a reply and thread is not nil' do - account = Fabricate(:account, username: 'username') - thread = Fabricate(:status, account: account, created_at: '2000-01-01T00:00:00Z') - reply = Fabricate(:status, thread: thread) - - entry = OStatus::AtomSerializer.new.object(reply) - - in_reply_to = entry.nodes.find { |node| node.name == 'thr:in-reply-to' } - expect(in_reply_to.ref).to eq "https://cb6e6126.ngrok.io/users/#{thread.account.to_param}/statuses/#{thread.id}" - expect(in_reply_to.href).to eq "https://cb6e6126.ngrok.io/@username/#{thread.id}" - end - - it 'does not append thr:in-reply-to element if thread is nil' do - status = Fabricate(:status, thread: nil) - entry = OStatus::AtomSerializer.new.object(status) - entry.nodes.each { |node| expect(node.name).not_to eq 'thr:in-reply-to' } - end - - it 'does not append ostatus:conversation element if conversation_id is nil' do - status = Fabricate.build(:status, conversation_id: nil) - status.save!(validate: false) - - entry = OStatus::AtomSerializer.new.object(status) - - entry.nodes.each { |node| expect(node.name).not_to eq 'ostatus:conversation' } - end - - it 'appends ostatus:conversation element if conversation_id is not nil' do - status = Fabricate(:status) - status.conversation.update!(created_at: '2000-01-01T00:00:00Z') - - entry = OStatus::AtomSerializer.new.object(status) - - conversation = entry.nodes.find { |node| node.name == 'ostatus:conversation' } - expect(conversation[:ref]).to eq "tag:cb6e6126.ngrok.io,2000-01-01:objectId=#{status.conversation.id}:objectType=Conversation" - end - end -end diff --git a/spec/lib/ostatus/tag_manager_spec.rb b/spec/lib/ostatus/tag_manager_spec.rb deleted file mode 100644 index 31195bae..00000000 --- a/spec/lib/ostatus/tag_manager_spec.rb +++ /dev/null @@ -1,70 +0,0 @@ -# frozen_string_literal: true - -require 'rails_helper' - -describe OStatus::TagManager do - describe '#unique_tag' do - it 'returns a unique tag' do - expect(OStatus::TagManager.instance.unique_tag(Time.utc(2000), 12, 'Status')).to eq 'tag:cb6e6126.ngrok.io,2000-01-01:objectId=12:objectType=Status' - end - end - - describe '#unique_tag_to_local_id' do - it 'returns the ID part' do - expect(OStatus::TagManager.instance.unique_tag_to_local_id('tag:cb6e6126.ngrok.io,2000-01-01:objectId=12:objectType=Status', 'Status')).to eql '12' - end - - it 'returns nil if it is not local id' do - expect(OStatus::TagManager.instance.unique_tag_to_local_id('tag:remote,2000-01-01:objectId=12:objectType=Status', 'Status')).to eq nil - end - - it 'returns nil if it is not expected type' do - expect(OStatus::TagManager.instance.unique_tag_to_local_id('tag:cb6e6126.ngrok.io,2000-01-01:objectId=12:objectType=Block', 'Status')).to eq nil - end - - it 'returns nil if it does not have object ID' do - expect(OStatus::TagManager.instance.unique_tag_to_local_id('tag:cb6e6126.ngrok.io,2000-01-01:objectType=Status', 'Status')).to eq nil - end - end - - describe '#local_id?' do - it 'returns true for a local ID' do - expect(OStatus::TagManager.instance.local_id?('tag:cb6e6126.ngrok.io;objectId=12:objectType=Status')).to be true - end - - it 'returns false for a foreign ID' do - expect(OStatus::TagManager.instance.local_id?('tag:foreign.tld;objectId=12:objectType=Status')).to be false - end - end - - describe '#uri_for' do - subject { OStatus::TagManager.instance.uri_for(target) } - - context 'comment object' do - let(:target) { Fabricate(:status, created_at: '2000-01-01T00:00:00Z', reply: true) } - - it 'returns the unique tag for status' do - expect(target.object_type).to eq :comment - is_expected.to eq target.uri - end - end - - context 'note object' do - let(:target) { Fabricate(:status, created_at: '2000-01-01T00:00:00Z', reply: false, thread: nil) } - - it 'returns the unique tag for status' do - expect(target.object_type).to eq :note - is_expected.to eq target.uri - end - end - - context 'person object' do - let(:target) { Fabricate(:account, username: 'alice') } - - it 'returns the URL for account' do - expect(target.object_type).to eq :person - is_expected.to eq 'https://cb6e6126.ngrok.io/users/alice' - end - end - end -end diff --git a/spec/lib/proof_provider/keybase/verifier_spec.rb b/spec/lib/proof_provider/keybase/verifier_spec.rb deleted file mode 100644 index 0081a735..00000000 --- a/spec/lib/proof_provider/keybase/verifier_spec.rb +++ /dev/null @@ -1,82 +0,0 @@ -require 'rails_helper' - -describe ProofProvider::Keybase::Verifier do - let(:my_domain) { Rails.configuration.x.local_domain } - - let(:keybase_proof) do - local_proof = AccountIdentityProof.new( - provider: 'Keybase', - provider_username: 'cryptoalice', - token: '11111111111111111111111111' - ) - - described_class.new('alice', 'cryptoalice', '11111111111111111111111111', my_domain) - end - - let(:query_params) do - "domain=#{my_domain}&kb_username=cryptoalice&sig_hash=11111111111111111111111111&username=alice" - end - - describe '#valid?' do - let(:base_url) { 'https://keybase.io/_/api/1.0/sig/proof_valid.json' } - - context 'when valid' do - before do - json_response_body = '{"status":{"code":0,"name":"OK"},"proof_valid":true}' - stub_request(:get, "#{base_url}?#{query_params}").to_return(status: 200, body: json_response_body) - end - - it 'calls out to keybase and returns true' do - expect(keybase_proof.valid?).to eq true - end - end - - context 'when invalid' do - before do - json_response_body = '{"status":{"code":0,"name":"OK"},"proof_valid":false}' - stub_request(:get, "#{base_url}?#{query_params}").to_return(status: 200, body: json_response_body) - end - - it 'calls out to keybase and returns false' do - expect(keybase_proof.valid?).to eq false - end - end - - context 'with an unexpected api response' do - before do - json_response_body = '{"status":{"code":100,"desc":"wrong size hex_id","fields":{"sig_hash":"wrong size hex_id"},"name":"INPUT_ERROR"}}' - stub_request(:get, "#{base_url}?#{query_params}").to_return(status: 200, body: json_response_body) - end - - it 'swallows the error and returns false' do - expect(keybase_proof.valid?).to eq false - end - end - end - - describe '#status' do - let(:base_url) { 'https://keybase.io/_/api/1.0/sig/proof_live.json' } - - context 'with a normal response' do - before do - json_response_body = '{"status":{"code":0,"name":"OK"},"proof_live":false,"proof_valid":true}' - stub_request(:get, "#{base_url}?#{query_params}").to_return(status: 200, body: json_response_body) - end - - it 'calls out to keybase and returns the status fields as proof_valid and proof_live' do - expect(keybase_proof.status).to include({ 'proof_valid' => true, 'proof_live' => false }) - end - end - - context 'with an unexpected keybase response' do - before do - json_response_body = '{"status":{"code":100,"desc":"missing non-optional field sig_hash","fields":{"sig_hash":"missing non-optional field sig_hash"},"name":"INPUT_ERROR"}}' - stub_request(:get, "#{base_url}?#{query_params}").to_return(status: 200, body: json_response_body) - end - - it 'raises a ProofProvider::Keybase::UnexpectedResponseError' do - expect { keybase_proof.status }.to raise_error ProofProvider::Keybase::UnexpectedResponseError - end - end - end -end diff --git a/spec/lib/request_spec.rb b/spec/lib/request_spec.rb deleted file mode 100644 index 7142edf9..00000000 --- a/spec/lib/request_spec.rb +++ /dev/null @@ -1,138 +0,0 @@ -# frozen_string_literal: true - -require 'rails_helper' -require 'securerandom' - -describe Request do - subject { Request.new(:get, 'http://example.com') } - - describe '#headers' do - it 'returns user agent' do - expect(subject.headers['User-Agent']).to be_present - end - - it 'returns the date header' do - expect(subject.headers['Date']).to be_present - end - - it 'returns the host header' do - expect(subject.headers['Host']).to be_present - end - - it 'does not return virtual request-target header' do - expect(subject.headers['(request-target)']).to be_nil - end - end - - describe '#on_behalf_of' do - it 'when used, adds signature header' do - subject.on_behalf_of(Fabricate(:account)) - expect(subject.headers['Signature']).to be_present - end - end - - describe '#add_headers' do - it 'adds headers to the request' do - subject.add_headers('Test' => 'Foo') - expect(subject.headers['Test']).to eq 'Foo' - end - end - - describe '#perform' do - context 'with valid host' do - before { stub_request(:get, 'http://example.com') } - - it 'executes a HTTP request' do - expect { |block| subject.perform &block }.to yield_control - expect(a_request(:get, 'http://example.com')).to have_been_made.once - end - - it 'executes a HTTP request when the first address is private' do - resolver = double - - allow(resolver).to receive(:getaddresses).with('example.com').and_return(%w(0.0.0.0 2001:4860:4860::8844)) - allow(resolver).to receive(:timeouts=).and_return(nil) - allow(Resolv::DNS).to receive(:open).and_yield(resolver) - - expect { |block| subject.perform &block }.to yield_control - expect(a_request(:get, 'http://example.com')).to have_been_made.once - end - - it 'sets headers' do - expect { |block| subject.perform &block }.to yield_control - expect(a_request(:get, 'http://example.com').with(headers: subject.headers)).to have_been_made - end - - it 'closes underlaying connection' do - expect_any_instance_of(HTTP::Client).to receive(:close) - expect { |block| subject.perform &block }.to yield_control - end - - it 'returns response which implements body_with_limit' do - subject.perform do |response| - expect(response).to respond_to :body_with_limit - end - end - end - - context 'with private host' do - around do |example| - WebMock.disable! - example.run - WebMock.enable! - end - - it 'raises GabSocial::ValidationError' do - resolver = double - - allow(resolver).to receive(:getaddresses).with('example.com').and_return(%w(0.0.0.0 2001:db8::face)) - allow(resolver).to receive(:timeouts=).and_return(nil) - allow(Resolv::DNS).to receive(:open).and_yield(resolver) - - expect { subject.perform }.to raise_error GabSocial::ValidationError - end - end - end - - describe "response's body_with_limit method" do - it 'rejects body more than 1 megabyte by default' do - stub_request(:any, 'http://example.com').to_return(body: SecureRandom.random_bytes(2.megabytes)) - expect { subject.perform { |response| response.body_with_limit } }.to raise_error GabSocial::LengthValidationError - end - - it 'accepts body less than 1 megabyte by default' do - stub_request(:any, 'http://example.com').to_return(body: SecureRandom.random_bytes(2.kilobytes)) - expect { subject.perform { |response| response.body_with_limit } }.not_to raise_error - end - - it 'rejects body by given size' do - stub_request(:any, 'http://example.com').to_return(body: SecureRandom.random_bytes(2.kilobytes)) - expect { subject.perform { |response| response.body_with_limit(1.kilobyte) } }.to raise_error GabSocial::LengthValidationError - end - - it 'rejects too large chunked body' do - stub_request(:any, 'http://example.com').to_return(body: SecureRandom.random_bytes(2.megabytes), headers: { 'Transfer-Encoding' => 'chunked' }) - expect { subject.perform { |response| response.body_with_limit } }.to raise_error GabSocial::LengthValidationError - end - - it 'rejects too large monolithic body' do - stub_request(:any, 'http://example.com').to_return(body: SecureRandom.random_bytes(2.megabytes), headers: { 'Content-Length' => 2.megabytes }) - expect { subject.perform { |response| response.body_with_limit } }.to raise_error GabSocial::LengthValidationError - end - - it 'uses binary encoding if Content-Type does not tell encoding' do - stub_request(:any, 'http://example.com').to_return(body: '', headers: { 'Content-Type' => 'text/html' }) - expect(subject.perform { |response| response.body_with_limit.encoding }).to eq Encoding::BINARY - end - - it 'uses binary encoding if Content-Type tells unknown encoding' do - stub_request(:any, 'http://example.com').to_return(body: '', headers: { 'Content-Type' => 'text/html; charset=unknown' }) - expect(subject.perform { |response| response.body_with_limit.encoding }).to eq Encoding::BINARY - end - - it 'uses encoding specified by Content-Type' do - stub_request(:any, 'http://example.com').to_return(body: '', headers: { 'Content-Type' => 'text/html; charset=UTF-8' }) - expect(subject.perform { |response| response.body_with_limit.encoding }).to eq Encoding::UTF_8 - end - end -end diff --git a/spec/lib/settings/extend_spec.rb b/spec/lib/settings/extend_spec.rb deleted file mode 100644 index 83ced423..00000000 --- a/spec/lib/settings/extend_spec.rb +++ /dev/null @@ -1,16 +0,0 @@ -# frozen_string_literal: true - -require 'rails_helper' - -RSpec.describe Settings::Extend do - class User - include Settings::Extend - end - - describe '#settings' do - it 'sets @settings as an instance of Settings::ScopedSettings' do - user = Fabricate(:user) - expect(user.settings).to be_kind_of Settings::ScopedSettings - end - end -end diff --git a/spec/lib/settings/scoped_settings_spec.rb b/spec/lib/settings/scoped_settings_spec.rb deleted file mode 100644 index 7566685b..00000000 --- a/spec/lib/settings/scoped_settings_spec.rb +++ /dev/null @@ -1,35 +0,0 @@ -# frozen_string_literal: true - -require 'rails_helper' - -RSpec.describe Settings::ScopedSettings do - let(:object) { Fabricate(:user) } - let(:scoped_setting) { described_class.new(object) } - let(:val) { 'whatever' } - let(:methods) { %i(auto_play_gif default_sensitive unfollow_modal boost_modal delete_modal reduce_motion system_font_ui noindex theme) } - - describe '.initialize' do - it 'sets @object' do - scoped_setting = described_class.new(object) - expect(scoped_setting.instance_variable_get(:@object)).to be object - end - end - - describe '#method_missing' do - it 'sets scoped_setting.method_name = val' do - methods.each do |key| - scoped_setting.send("#{key}=", val) - expect(scoped_setting.send(key)).to eq val - end - end - end - - describe '#[]= and #[]' do - it 'sets [key] = val' do - methods.each do |key| - scoped_setting[key] = val - expect(scoped_setting[key]).to eq val - end - end - end -end diff --git a/spec/lib/status_filter_spec.rb b/spec/lib/status_filter_spec.rb deleted file mode 100644 index a851014d..00000000 --- a/spec/lib/status_filter_spec.rb +++ /dev/null @@ -1,83 +0,0 @@ -# frozen_string_literal: true - -require 'rails_helper' - -describe StatusFilter do - describe '#filtered?' do - let(:status) { Fabricate(:status) } - - context 'without an account' do - subject { described_class.new(status, nil) } - - context 'when there are no connections' do - it { is_expected.not_to be_filtered } - end - - context 'when status account is silenced' do - before do - status.account.silence! - end - - it { is_expected.to be_filtered } - end - - context 'when status policy does not allow show' do - before do - expect_any_instance_of(StatusPolicy).to receive(:show?).and_return(false) - end - - it { is_expected.to be_filtered } - end - end - - context 'with real account' do - let(:account) { Fabricate(:account) } - subject { described_class.new(status, account) } - - context 'when there are no connections' do - it { is_expected.not_to be_filtered } - end - - context 'when status account is blocked' do - before do - Fabricate(:block, account: account, target_account: status.account) - end - - it { is_expected.to be_filtered } - end - - context 'when status account domain is blocked' do - before do - status.account.update(domain: 'example.com') - Fabricate(:account_domain_block, account: account, domain: status.account_domain) - end - - it { is_expected.to be_filtered } - end - - context 'when status account is muted' do - before do - Fabricate(:mute, account: account, target_account: status.account) - end - - it { is_expected.to be_filtered } - end - - context 'when status account is silenced' do - before do - status.account.silence! - end - - it { is_expected.to be_filtered } - end - - context 'when status policy does not allow show' do - before do - expect_any_instance_of(StatusPolicy).to receive(:show?).and_return(false) - end - - it { is_expected.to be_filtered } - end - end - end -end diff --git a/spec/lib/status_finder_spec.rb b/spec/lib/status_finder_spec.rb deleted file mode 100644 index 6b4ee434..00000000 --- a/spec/lib/status_finder_spec.rb +++ /dev/null @@ -1,62 +0,0 @@ -# frozen_string_literal: true - -require 'rails_helper' - -describe StatusFinder do - include RoutingHelper - - describe '#status' do - subject { described_class.new(url) } - - context 'with a status url' do - let(:status) { Fabricate(:status) } - let(:url) { short_account_status_url(account_username: status.account.username, id: status.id) } - - it 'finds the stream entry' do - expect(subject.status).to eq(status) - end - - it 'raises an error if action is not :show' do - recognized = Rails.application.routes.recognize_path(url) - expect(recognized).to receive(:[]).with(:action).and_return(:create) - expect(Rails.application.routes).to receive(:recognize_path).with(url).and_return(recognized) - - expect { subject.status }.to raise_error(ActiveRecord::RecordNotFound) - end - end - - context 'with a stream entry url' do - let(:stream_entry) { Fabricate(:stream_entry) } - let(:url) { account_stream_entry_url(stream_entry.account, stream_entry) } - - it 'finds the stream entry' do - expect(subject.status).to eq(stream_entry.status) - end - end - - context 'with a remote url even if id exists on local' do - let(:status) { Fabricate(:status) } - let(:url) { "https://example.com/users/test/statuses/#{status.id}" } - - it 'raises an error' do - expect { subject.status }.to raise_error(ActiveRecord::RecordNotFound) - end - end - - context 'with a plausible url' do - let(:url) { 'https://example.com/users/test/updates/123/embed' } - - it 'raises an error' do - expect { subject.status }.to raise_error(ActiveRecord::RecordNotFound) - end - end - - context 'with an unrecognized url' do - let(:url) { 'https://example.com/about' } - - it 'raises an error' do - expect { subject.status }.to raise_error(ActiveRecord::RecordNotFound) - end - end - end -end diff --git a/spec/lib/tag_manager_spec.rb b/spec/lib/tag_manager_spec.rb deleted file mode 100644 index 3a804ac0..00000000 --- a/spec/lib/tag_manager_spec.rb +++ /dev/null @@ -1,164 +0,0 @@ -require 'rails_helper' - -RSpec.describe TagManager do - describe '#local_domain?' do - # The following comparisons MUST be case-insensitive. - - around do |example| - original_local_domain = Rails.configuration.x.local_domain - Rails.configuration.x.local_domain = 'domain.test' - - example.run - - Rails.configuration.x.local_domain = original_local_domain - end - - it 'returns true for nil' do - expect(TagManager.instance.local_domain?(nil)).to eq true - end - - it 'returns true if the slash-stripped string equals to local domain' do - expect(TagManager.instance.local_domain?('DoMaIn.Test/')).to eq true - end - - it 'returns false for irrelevant string' do - expect(TagManager.instance.local_domain?('DoMaIn.Test!')).to eq false - end - end - - describe '#web_domain?' do - # The following comparisons MUST be case-insensitive. - - around do |example| - original_web_domain = Rails.configuration.x.web_domain - Rails.configuration.x.web_domain = 'domain.test' - - example.run - - Rails.configuration.x.web_domain = original_web_domain - end - - it 'returns true for nil' do - expect(TagManager.instance.web_domain?(nil)).to eq true - end - - it 'returns true if the slash-stripped string equals to web domain' do - expect(TagManager.instance.web_domain?('DoMaIn.Test/')).to eq true - end - - it 'returns false for string with irrelevant characters' do - expect(TagManager.instance.web_domain?('DoMaIn.Test!')).to eq false - end - end - - describe '#normalize_domain' do - it 'returns nil if the given parameter is nil' do - expect(TagManager.instance.normalize_domain(nil)).to eq nil - end - - it 'returns normalized domain' do - expect(TagManager.instance.normalize_domain('DoMaIn.Test/')).to eq 'domain.test' - end - end - - describe '#local_url?' do - around do |example| - original_web_domain = Rails.configuration.x.web_domain - example.run - Rails.configuration.x.web_domain = original_web_domain - end - - it 'returns true if the normalized string with port is local URL' do - Rails.configuration.x.web_domain = 'domain.test:42' - expect(TagManager.instance.local_url?('https://DoMaIn.Test:42/')).to eq true - end - - it 'returns true if the normalized string without port is local URL' do - Rails.configuration.x.web_domain = 'domain.test' - expect(TagManager.instance.local_url?('https://DoMaIn.Test/')).to eq true - end - - it 'returns false for string with irrelevant characters' do - Rails.configuration.x.web_domain = 'domain.test' - expect(TagManager.instance.local_url?('https://domainn.test/')).to eq false - end - end - - describe '#same_acct?' do - # The following comparisons MUST be case-insensitive. - - it 'returns true if the needle has a correct username and domain for remote user' do - expect(TagManager.instance.same_acct?('username@domain.test', 'UsErNaMe@DoMaIn.Test')).to eq true - end - - it 'returns false if the needle is missing a domain for remote user' do - expect(TagManager.instance.same_acct?('username@domain.test', 'UsErNaMe')).to eq false - end - - it 'returns false if the needle has an incorrect domain for remote user' do - expect(TagManager.instance.same_acct?('username@domain.test', 'UsErNaMe@incorrect.test')).to eq false - end - - it 'returns false if the needle has an incorrect username for remote user' do - expect(TagManager.instance.same_acct?('username@domain.test', 'incorrect@DoMaIn.test')).to eq false - end - - it 'returns true if the needle has a correct username and domain for local user' do - expect(TagManager.instance.same_acct?('username', 'UsErNaMe@Cb6E6126.nGrOk.Io')).to eq true - end - - it 'returns true if the needle is missing a domain for local user' do - expect(TagManager.instance.same_acct?('username', 'UsErNaMe')).to eq true - end - - it 'returns false if the needle has an incorrect username for local user' do - expect(TagManager.instance.same_acct?('username', 'UsErNaM@Cb6E6126.nGrOk.Io')).to eq false - end - - it 'returns false if the needle has an incorrect domain for local user' do - expect(TagManager.instance.same_acct?('username', 'incorrect@Cb6E6126.nGrOk.Io')).to eq false - end - end - - describe '#url_for' do - let(:alice) { Fabricate(:account, username: 'alice') } - - subject { TagManager.instance.url_for(target) } - - context 'activity object' do - let(:target) { Fabricate(:status, account: alice, reblog: Fabricate(:status)).stream_entry } - - it 'returns the unique tag for status' do - expect(target.object_type).to eq :activity - is_expected.to eq "https://cb6e6126.ngrok.io/@alice/#{target.id}" - end - end - - context 'comment object' do - let(:target) { Fabricate(:status, account: alice, reply: true) } - - it 'returns the unique tag for status' do - expect(target.object_type).to eq :comment - is_expected.to eq "https://cb6e6126.ngrok.io/@alice/#{target.id}" - end - end - - context 'note object' do - let(:target) { Fabricate(:status, account: alice, reply: false, thread: nil) } - - it 'returns the unique tag for status' do - expect(target.object_type).to eq :note - is_expected.to eq "https://cb6e6126.ngrok.io/@alice/#{target.id}" - end - end - - context 'person object' do - let(:target) { alice } - - it 'returns the URL for account' do - expect(target.object_type).to eq :person - is_expected.to eq 'https://cb6e6126.ngrok.io/@alice' - end - end - end -end diff --git a/spec/lib/user_settings_decorator_spec.rb b/spec/lib/user_settings_decorator_spec.rb deleted file mode 100644 index 2ad1fa32..00000000 --- a/spec/lib/user_settings_decorator_spec.rb +++ /dev/null @@ -1,84 +0,0 @@ -# frozen_string_literal: true - -require 'rails_helper' - -describe UserSettingsDecorator do - describe 'update' do - let(:user) { Fabricate(:user) } - let(:settings) { described_class.new(user) } - - it 'updates the user settings value for email notifications' do - values = { 'notification_emails' => { 'follow' => '1' } } - - settings.update(values) - expect(user.settings['notification_emails']['follow']).to eq true - end - - it 'updates the user settings value for interactions' do - values = { 'interactions' => { 'must_be_follower' => '0' } } - - settings.update(values) - expect(user.settings['interactions']['must_be_follower']).to eq false - end - - it 'updates the user settings value for privacy' do - values = { 'setting_default_privacy' => 'public' } - - settings.update(values) - expect(user.settings['default_privacy']).to eq 'public' - end - - it 'updates the user settings value for sensitive' do - values = { 'setting_default_sensitive' => '1' } - - settings.update(values) - expect(user.settings['default_sensitive']).to eq true - end - - it 'updates the user settings value for unfollow modal' do - values = { 'setting_unfollow_modal' => '0' } - - settings.update(values) - expect(user.settings['unfollow_modal']).to eq false - end - - it 'updates the user settings value for repost modal' do - values = { 'setting_boost_modal' => '1' } - - settings.update(values) - expect(user.settings['boost_modal']).to eq true - end - - it 'updates the user settings value for delete toot modal' do - values = { 'setting_delete_modal' => '0' } - - settings.update(values) - expect(user.settings['delete_modal']).to eq false - end - - it 'updates the user settings value for gif auto play' do - values = { 'setting_auto_play_gif' => '0' } - - settings.update(values) - expect(user.settings['auto_play_gif']).to eq false - end - - it 'updates the user settings value for system font in UI' do - values = { 'setting_system_font_ui' => '0' } - - settings.update(values) - expect(user.settings['system_font_ui']).to eq false - end - - it 'decoerces setting values before applying' do - values = { - 'setting_delete_modal' => 'false', - 'setting_boost_modal' => 'true', - } - - settings.update(values) - expect(user.settings['delete_modal']).to eq false - expect(user.settings['boost_modal']).to eq true - end - end -end diff --git a/spec/lib/webfinger_resource_spec.rb b/spec/lib/webfinger_resource_spec.rb deleted file mode 100644 index 287537a2..00000000 --- a/spec/lib/webfinger_resource_spec.rb +++ /dev/null @@ -1,127 +0,0 @@ -require 'rails_helper' - -describe WebfingerResource do - around do |example| - before_local = Rails.configuration.x.local_domain - before_web = Rails.configuration.x.web_domain - example.run - Rails.configuration.x.local_domain = before_local - Rails.configuration.x.web_domain = before_web - end - - describe '#username' do - describe 'with a URL value' do - it 'raises with a route whose controller is not AccountsController' do - resource = 'https://example.com/users/alice/other' - - expect { - WebfingerResource.new(resource).username - }.to raise_error(ActiveRecord::RecordNotFound) - end - - it 'raises with a route whose action is not show' do - resource = 'https://example.com/users/alice' - - recognized = Rails.application.routes.recognize_path(resource) - allow(recognized).to receive(:[]).with(:controller).and_return('accounts') - allow(recognized).to receive(:[]).with(:username).and_return('alice') - expect(recognized).to receive(:[]).with(:action).and_return('create') - - expect(Rails.application.routes).to receive(:recognize_path).with(resource).and_return(recognized).at_least(:once) - - expect { - WebfingerResource.new(resource).username - }.to raise_error(ActiveRecord::RecordNotFound) - end - - it 'raises with a string that doesnt start with URL' do - resource = 'website for http://example.com/users/alice/other' - - expect { - WebfingerResource.new(resource).username - }.to raise_error(ActiveRecord::RecordNotFound) - end - - it 'finds the username in a valid https route' do - resource = 'https://example.com/users/alice' - - result = WebfingerResource.new(resource).username - expect(result).to eq 'alice' - end - - it 'finds the username in a mixed case http route' do - resource = 'HTTp://exAMPLEe.com/users/alice' - - result = WebfingerResource.new(resource).username - expect(result).to eq 'alice' - end - - it 'finds the username in a valid http route' do - resource = 'http://example.com/users/alice' - - result = WebfingerResource.new(resource).username - expect(result).to eq 'alice' - end - end - - describe 'with a username and hostname value' do - it 'raises on a non-local domain' do - resource = 'user@remote-host.com' - - expect { - WebfingerResource.new(resource).username - }.to raise_error(ActiveRecord::RecordNotFound) - end - - it 'finds username for a local domain' do - Rails.configuration.x.local_domain = 'example.com' - resource = 'alice@example.com' - - result = WebfingerResource.new(resource).username - expect(result).to eq 'alice' - end - - it 'finds username for a web domain' do - Rails.configuration.x.web_domain = 'example.com' - resource = 'alice@example.com' - - result = WebfingerResource.new(resource).username - expect(result).to eq 'alice' - end - end - - describe 'with an acct value' do - it 'raises on a non-local domain' do - resource = 'acct:user@remote-host.com' - - expect { - WebfingerResource.new(resource).username - }.to raise_error(ActiveRecord::RecordNotFound) - end - - it 'raises on a nonsense domain' do - resource = 'acct:user@remote-host@remote-hostess.remote.local@remote' - - expect { - WebfingerResource.new(resource).username - }.to raise_error(ActiveRecord::RecordNotFound) - end - - it 'finds the username for a local account if the domain is the local one' do - Rails.configuration.x.local_domain = 'example.com' - resource = 'acct:alice@example.com' - - result = WebfingerResource.new(resource).username - expect(result).to eq 'alice' - end - - it 'finds the username for a local account if the domain is the Web one' do - Rails.configuration.x.web_domain = 'example.com' - resource = 'acct:alice@example.com' - - result = WebfingerResource.new(resource).username - expect(result).to eq 'alice' - end - end - end -end diff --git a/spec/mailers/admin_mailer_spec.rb b/spec/mailers/admin_mailer_spec.rb deleted file mode 100644 index 4a8ef7b5..00000000 --- a/spec/mailers/admin_mailer_spec.rb +++ /dev/null @@ -1,22 +0,0 @@ -# frozen_string_literal: true - -require 'rails_helper' - -RSpec.describe AdminMailer, type: :mailer do - describe '.new_report' do - let(:sender) { Fabricate(:account, username: 'John', user: Fabricate(:user)) } - let(:recipient) { Fabricate(:account, username: 'Mike', user: Fabricate(:user, locale: :en)) } - let(:report) { Fabricate(:report, account: sender, target_account: recipient) } - let(:mail) { described_class.new_report(recipient, report) } - - it 'renders the headers' do - expect(mail.subject).to eq("New report for cb6e6126.ngrok.io (##{report.id})") - expect(mail.to).to eq [recipient.user_email] - expect(mail.from).to eq ['notifications@localhost'] - end - - it 'renders the body' do - expect(mail.body.encoded).to eq("Mike,\r\n\r\nJohn has reported Mike\r\n\r\nView: https://cb6e6126.ngrok.io/admin/reports/#{report.id}\r\n") - end - end -end diff --git a/spec/mailers/notification_mailer_spec.rb b/spec/mailers/notification_mailer_spec.rb deleted file mode 100644 index 03652ab7..00000000 --- a/spec/mailers/notification_mailer_spec.rb +++ /dev/null @@ -1,135 +0,0 @@ -require "rails_helper" - -RSpec.describe NotificationMailer, type: :mailer do - let(:receiver) { Fabricate(:user, account: Fabricate(:account, username: 'alice')) } - let(:sender) { Fabricate(:account, username: 'bob') } - let(:foreign_status) { Fabricate(:status, account: sender, text: 'The body of the foreign status') } - let(:own_status) { Fabricate(:status, account: receiver.account, text: 'The body of the own status') } - - shared_examples 'localized subject' do |*args, **kwrest| - it 'renders subject localized for the locale of the receiver' do - locale = %i(de en).sample - receiver.update!(locale: locale) - expect(mail.subject).to eq I18n.t(*args, kwrest.merge(locale: locale)) - end - - it 'renders subject localized for the default locale if the locale of the receiver is unavailable' do - receiver.update!(locale: nil) - expect(mail.subject).to eq I18n.t(*args, kwrest.merge(locale: I18n.default_locale)) - end - end - - describe "mention" do - let(:mention) { Mention.create!(account: receiver.account, status: foreign_status) } - let(:mail) { NotificationMailer.mention(receiver.account, Notification.create!(account: receiver.account, activity: mention)) } - - include_examples 'localized subject', 'notification_mailer.mention.subject', name: 'bob' - - it "renders the headers" do - expect(mail.subject).to eq("You were mentioned by bob") - expect(mail.to).to eq([receiver.email]) - end - - it "renders the body" do - expect(mail.body.encoded).to match("You were mentioned by bob") - expect(mail.body.encoded).to include 'The body of the foreign status' - end - end - - describe "follow" do - let(:follow) { sender.follow!(receiver.account) } - let(:mail) { NotificationMailer.follow(receiver.account, Notification.create!(account: receiver.account, activity: follow)) } - - include_examples 'localized subject', 'notification_mailer.follow.subject', name: 'bob' - - it "renders the headers" do - expect(mail.subject).to eq("bob is now following you") - expect(mail.to).to eq([receiver.email]) - end - - it "renders the body" do - expect(mail.body.encoded).to match("bob is now following you") - end - end - - describe "favourite" do - let(:favourite) { Favourite.create!(account: sender, status: own_status) } - let(:mail) { NotificationMailer.favourite(own_status.account, Notification.create!(account: receiver.account, activity: favourite)) } - - include_examples 'localized subject', 'notification_mailer.favourite.subject', name: 'bob' - - it "renders the headers" do - expect(mail.subject).to eq("bob favourited your status") - expect(mail.to).to eq([receiver.email]) - end - - it "renders the body" do - expect(mail.body.encoded).to match("Your status was favourited by bob") - expect(mail.body.encoded).to include 'The body of the own status' - end - end - - describe "reblog" do - let(:reblog) { Status.create!(account: sender, reblog: own_status) } - let(:mail) { NotificationMailer.reblog(own_status.account, Notification.create!(account: receiver.account, activity: reblog)) } - - include_examples 'localized subject', 'notification_mailer.reblog.subject', name: 'bob' - - it "renders the headers" do - expect(mail.subject).to eq("bob reposted your status") - expect(mail.to).to eq([receiver.email]) - end - - it "renders the body" do - expect(mail.body.encoded).to match("Your status was reposted by bob") - expect(mail.body.encoded).to include 'The body of the own status' - end - end - - describe 'follow_request' do - let(:follow_request) { Fabricate(:follow_request, account: sender, target_account: receiver.account) } - let(:mail) { NotificationMailer.follow_request(receiver.account, Notification.create!(account: receiver.account, activity: follow_request)) } - - include_examples 'localized subject', 'notification_mailer.follow_request.subject', name: 'bob' - - it 'renders the headers' do - expect(mail.subject).to eq('Pending follower: bob') - expect(mail.to).to eq([receiver.email]) - end - - it 'renders the body' do - expect(mail.body.encoded).to match("bob has requested to follow you") - end - end - - describe 'digest' do - before do - mention = Fabricate(:mention, account: receiver.account, status: foreign_status) - Fabricate(:notification, account: receiver.account, activity: mention) - sender.follow!(receiver.account) - end - - context do - let!(:mail) { NotificationMailer.digest(receiver.account, since: 5.days.ago) } - - include_examples 'localized subject', 'notification_mailer.digest.subject', count: 1, name: 'bob' - - it 'renders the headers' do - expect(mail.subject).to match('notification since your last') - expect(mail.to).to eq([receiver.email]) - end - - it 'renders the body' do - expect(mail.body.encoded).to match('brief summary') - expect(mail.body.encoded).to include 'The body of the foreign status' - expect(mail.body.encoded).to include sender.username - end - end - - it 'includes activities since the receiver last signed in' do - receiver.update!(last_emailed_at: nil, current_sign_in_at: '2000-03-01T00:00:00Z') - mail = NotificationMailer.digest(receiver.account) - expect(mail.body.encoded).to include 'Mar 01, 2000, 00:00' - end - end -end diff --git a/spec/mailers/previews/admin_mailer_preview.rb b/spec/mailers/previews/admin_mailer_preview.rb deleted file mode 100644 index 561a56b7..00000000 --- a/spec/mailers/previews/admin_mailer_preview.rb +++ /dev/null @@ -1,8 +0,0 @@ -# Preview all emails at http://localhost:3000/rails/mailers/admin_mailer - -class AdminMailerPreview < ActionMailer::Preview - # Preview this email at http://localhost:3000/rails/mailers/admin_mailer/new_pending_account - def new_pending_account - AdminMailer.new_pending_account(Account.first, User.pending.first) - end -end diff --git a/spec/mailers/previews/notification_mailer_preview.rb b/spec/mailers/previews/notification_mailer_preview.rb deleted file mode 100644 index e31445c3..00000000 --- a/spec/mailers/previews/notification_mailer_preview.rb +++ /dev/null @@ -1,38 +0,0 @@ -# Preview all emails at http://localhost:3000/rails/mailers/notification_mailer - -class NotificationMailerPreview < ActionMailer::Preview - # Preview this email at http://localhost:3000/rails/mailers/notification_mailer/mention - def mention - m = Mention.last - NotificationMailer.mention(m.account, Notification.find_by(activity: m)) - end - - # Preview this email at http://localhost:3000/rails/mailers/notification_mailer/follow - def follow - f = Follow.last - NotificationMailer.follow(f.target_account, Notification.find_by(activity: f)) - end - - # Preview this email at http://localhost:3000/rails/mailers/notification_mailer/follow_request - def follow_request - f = Follow.last - NotificationMailer.follow_request(f.target_account, Notification.find_by(activity: f)) - end - - # Preview this email at http://localhost:3000/rails/mailers/notification_mailer/favourite - def favourite - f = Favourite.last - NotificationMailer.favourite(f.status.account, Notification.find_by(activity: f)) - end - - # Preview this email at http://localhost:3000/rails/mailers/notification_mailer/reblog - def reblog - r = Status.where.not(reblog_of_id: nil).first - NotificationMailer.reblog(r.reblog.account, Notification.find_by(activity: r)) - end - - # Preview this email at http://localhost:3000/rails/mailers/notification_mailer/digest - def digest - NotificationMailer.digest(Account.first, since: 90.days.ago) - end -end diff --git a/spec/mailers/previews/user_mailer_preview.rb b/spec/mailers/previews/user_mailer_preview.rb deleted file mode 100644 index 53c83649..00000000 --- a/spec/mailers/previews/user_mailer_preview.rb +++ /dev/null @@ -1,47 +0,0 @@ -# Preview all emails at http://localhost:3000/rails/mailers/user_mailer - -class UserMailerPreview < ActionMailer::Preview - # Preview this email at http://localhost:3000/rails/mailers/user_mailer/confirmation_instructions - def confirmation_instructions - UserMailer.confirmation_instructions(User.first, 'spec') - end - - # Preview this email at http://localhost:3000/rails/mailers/user_mailer/email_changed - def email_changed - user = User.first - user.unconfirmed_email = 'foo@bar.com' - UserMailer.email_changed(user) - end - - # Preview this email at http://localhost:3000/rails/mailers/user_mailer/password_change - def password_change - UserMailer.password_change(User.first) - end - - # Preview this email at http://localhost:3000/rails/mailers/user_mailer/reconfirmation_instructions - def reconfirmation_instructions - user = User.first - user.unconfirmed_email = 'foo@bar.com' - UserMailer.confirmation_instructions(user, 'spec') - end - - # Preview this email at http://localhost:3000/rails/mailers/user_mailer/reset_password_instructions - def reset_password_instructions - UserMailer.reset_password_instructions(User.first, 'spec') - end - - # Preview this email at http://localhost:3000/rails/mailers/user_mailer/welcome - def welcome - UserMailer.welcome(User.first) - end - - # Preview this email at http://localhost:3000/rails/mailers/user_mailer/backup_ready - def backup_ready - UserMailer.backup_ready(User.first, Backup.first) - end - - # Preview this email at http://localhost:3000/rails/mailers/user_mailer/warning - def warning - UserMailer.warning(User.first, AccountWarning.new(text: '', action: :silence)) - end -end diff --git a/spec/mailers/user_mailer_spec.rb b/spec/mailers/user_mailer_spec.rb deleted file mode 100644 index 6b430b50..00000000 --- a/spec/mailers/user_mailer_spec.rb +++ /dev/null @@ -1,86 +0,0 @@ -# frozen_string_literal: true - -require 'rails_helper' - -describe UserMailer, type: :mailer do - let(:receiver) { Fabricate(:user) } - - shared_examples 'localized subject' do |*args, **kwrest| - it 'renders subject localized for the locale of the receiver' do - locale = I18n.available_locales.sample - receiver.update!(locale: locale) - expect(mail.subject).to eq I18n.t(*args, kwrest.merge(locale: locale)) - end - - it 'renders subject localized for the default locale if the locale of the receiver is unavailable' do - receiver.update!(locale: nil) - expect(mail.subject).to eq I18n.t(*args, kwrest.merge(locale: I18n.default_locale)) - end - end - - describe 'confirmation_instructions' do - let(:mail) { UserMailer.confirmation_instructions(receiver, 'spec') } - - it 'renders confirmation instructions' do - receiver.update!(locale: nil) - expect(mail.body.encoded).to include I18n.t('devise.mailer.confirmation_instructions.title') - expect(mail.body.encoded).to include 'spec' - expect(mail.body.encoded).to include Rails.configuration.x.local_domain - end - - include_examples 'localized subject', - 'devise.mailer.confirmation_instructions.subject', - instance: Rails.configuration.x.local_domain - end - - describe 'reconfirmation_instructions' do - let(:mail) { UserMailer.confirmation_instructions(receiver, 'spec') } - - it 'renders reconfirmation instructions' do - receiver.update!(email: 'new-email@example.com', locale: nil) - expect(mail.body.encoded).to include I18n.t('devise.mailer.reconfirmation_instructions.title') - expect(mail.body.encoded).to include 'spec' - expect(mail.body.encoded).to include Rails.configuration.x.local_domain - expect(mail.subject).to eq I18n.t('devise.mailer.reconfirmation_instructions.subject', - instance: Rails.configuration.x.local_domain, - locale: I18n.default_locale) - end - end - - describe 'reset_password_instructions' do - let(:mail) { UserMailer.reset_password_instructions(receiver, 'spec') } - - it 'renders reset password instructions' do - receiver.update!(locale: nil) - expect(mail.body.encoded).to include I18n.t('devise.mailer.reset_password_instructions.title') - expect(mail.body.encoded).to include 'spec' - end - - include_examples 'localized subject', - 'devise.mailer.reset_password_instructions.subject' - end - - describe 'password_change' do - let(:mail) { UserMailer.password_change(receiver) } - - it 'renders password change notification' do - receiver.update!(locale: nil) - expect(mail.body.encoded).to include I18n.t('devise.mailer.password_change.title') - end - - include_examples 'localized subject', - 'devise.mailer.password_change.subject' - end - - describe 'email_changed' do - let(:mail) { UserMailer.email_changed(receiver) } - - it 'renders email change notification' do - receiver.update!(locale: nil) - expect(mail.body.encoded).to include I18n.t('devise.mailer.email_changed.title') - end - - include_examples 'localized subject', - 'devise.mailer.email_changed.subject' - end -end diff --git a/spec/models/account_conversation_spec.rb b/spec/models/account_conversation_spec.rb deleted file mode 100644 index 70a76281..00000000 --- a/spec/models/account_conversation_spec.rb +++ /dev/null @@ -1,72 +0,0 @@ -require 'rails_helper' - -RSpec.describe AccountConversation, type: :model do - let!(:alice) { Fabricate(:account, username: 'alice') } - let!(:bob) { Fabricate(:account, username: 'bob') } - let!(:mark) { Fabricate(:account, username: 'mark') } - - describe '.add_status' do - it 'creates new record when no others exist' do - status = Fabricate(:status, account: alice, visibility: :direct) - status.mentions.create(account: bob) - - conversation = AccountConversation.add_status(alice, status) - - expect(conversation.participant_accounts).to include(bob) - expect(conversation.last_status).to eq status - expect(conversation.status_ids).to eq [status.id] - end - - it 'appends to old record when there is a match' do - last_status = Fabricate(:status, account: alice, visibility: :direct) - conversation = AccountConversation.create!(account: alice, conversation: last_status.conversation, participant_account_ids: [bob.id], status_ids: [last_status.id]) - - status = Fabricate(:status, account: bob, visibility: :direct, thread: last_status) - status.mentions.create(account: alice) - - new_conversation = AccountConversation.add_status(alice, status) - - expect(new_conversation.id).to eq conversation.id - expect(new_conversation.participant_accounts).to include(bob) - expect(new_conversation.last_status).to eq status - expect(new_conversation.status_ids).to eq [last_status.id, status.id] - end - - it 'creates new record when new participants are added' do - last_status = Fabricate(:status, account: alice, visibility: :direct) - conversation = AccountConversation.create!(account: alice, conversation: last_status.conversation, participant_account_ids: [bob.id], status_ids: [last_status.id]) - - status = Fabricate(:status, account: bob, visibility: :direct, thread: last_status) - status.mentions.create(account: alice) - status.mentions.create(account: mark) - - new_conversation = AccountConversation.add_status(alice, status) - - expect(new_conversation.id).to_not eq conversation.id - expect(new_conversation.participant_accounts).to include(bob, mark) - expect(new_conversation.last_status).to eq status - expect(new_conversation.status_ids).to eq [status.id] - end - end - - describe '.remove_status' do - it 'updates last status to a previous value' do - last_status = Fabricate(:status, account: alice, visibility: :direct) - status = Fabricate(:status, account: alice, visibility: :direct) - conversation = AccountConversation.create!(account: alice, conversation: last_status.conversation, participant_account_ids: [bob.id], status_ids: [status.id, last_status.id]) - last_status.mentions.create(account: bob) - last_status.destroy! - conversation.reload - expect(conversation.last_status).to eq status - expect(conversation.status_ids).to eq [status.id] - end - - it 'removes the record if no other statuses are referenced' do - last_status = Fabricate(:status, account: alice, visibility: :direct) - conversation = AccountConversation.create!(account: alice, conversation: last_status.conversation, participant_account_ids: [bob.id], status_ids: [last_status.id]) - last_status.mentions.create(account: bob) - last_status.destroy! - expect(AccountConversation.where(id: conversation.id).count).to eq 0 - end - end -end diff --git a/spec/models/account_domain_block_spec.rb b/spec/models/account_domain_block_spec.rb deleted file mode 100644 index 469bc05c..00000000 --- a/spec/models/account_domain_block_spec.rb +++ /dev/null @@ -1,22 +0,0 @@ -require 'rails_helper' - -RSpec.describe AccountDomainBlock, type: :model do - it 'removes blocking cache after creation' do - account = Fabricate(:account) - Rails.cache.write("exclude_domains_for:#{account.id}", 'a.domain.already.blocked') - - AccountDomainBlock.create!(account: account, domain: 'a.domain.blocked.later') - - expect(Rails.cache.exist?("exclude_domains_for:#{account.id}")).to eq false - end - - it 'removes blocking cache after destruction' do - account = Fabricate(:account) - block = AccountDomainBlock.create!(account: account, domain: 'domain') - Rails.cache.write("exclude_domains_for:#{account.id}", 'domain') - - block.destroy! - - expect(Rails.cache.exist?("exclude_domains_for:#{account.id}")).to eq false - end -end diff --git a/spec/models/account_filter_spec.rb b/spec/models/account_filter_spec.rb deleted file mode 100644 index 176a0eea..00000000 --- a/spec/models/account_filter_spec.rb +++ /dev/null @@ -1,57 +0,0 @@ -require 'rails_helper' - -describe AccountFilter do - describe 'with empty params' do - it 'defaults to recent local not-suspended account list' do - filter = described_class.new({}) - - expect(filter.results).to eq Account.local.recent.without_suspended - end - end - - describe 'with invalid params' do - it 'raises with key error' do - filter = described_class.new(wrong: true) - - expect { filter.results }.to raise_error(/wrong/) - end - end - - describe 'with valid params' do - it 'combines filters on Account' do - filter = described_class.new( - by_domain: 'test.com', - silenced: true, - username: 'test', - display_name: 'name', - email: 'user@example.com', - ) - - allow(Account).to receive(:where).and_return(Account.none) - allow(Account).to receive(:silenced).and_return(Account.none) - allow(Account).to receive(:matches_display_name).and_return(Account.none) - allow(Account).to receive(:matches_username).and_return(Account.none) - allow(User).to receive(:matches_email).and_return(User.none) - - filter.results - - expect(Account).to have_received(:where).with(domain: 'test.com') - expect(Account).to have_received(:silenced) - expect(Account).to have_received(:matches_username).with('test') - expect(Account).to have_received(:matches_display_name).with('name') - expect(User).to have_received(:matches_email).with('user@example.com') - end - - describe 'that call account methods' do - %i(local remote silenced suspended).each do |option| - it "delegates the #{option} option" do - allow(Account).to receive(option).and_return(Account.none) - filter = described_class.new({ option => true }) - filter.results - - expect(Account).to have_received(option).at_least(1) - end - end - end - end -end diff --git a/spec/models/account_moderation_note_spec.rb b/spec/models/account_moderation_note_spec.rb deleted file mode 100644 index 69bd5500..00000000 --- a/spec/models/account_moderation_note_spec.rb +++ /dev/null @@ -1,4 +0,0 @@ -require 'rails_helper' - -RSpec.describe AccountModerationNote, type: :model do -end diff --git a/spec/models/account_spec.rb b/spec/models/account_spec.rb deleted file mode 100644 index 37987231..00000000 --- a/spec/models/account_spec.rb +++ /dev/null @@ -1,792 +0,0 @@ -require 'rails_helper' - -RSpec.describe Account, type: :model do - context do - let(:bob) { Fabricate(:account, username: 'bob') } - subject { Fabricate(:account) } - - describe '#follow!' do - it 'creates a follow' do - follow = subject.follow!(bob) - - expect(follow).to be_instance_of Follow - expect(follow.account).to eq subject - expect(follow.target_account).to eq bob - end - end - - describe '#unfollow!' do - before do - subject.follow!(bob) - end - - it 'destroys a follow' do - unfollow = subject.unfollow!(bob) - - expect(unfollow).to be_instance_of Follow - expect(unfollow.account).to eq subject - expect(unfollow.target_account).to eq bob - expect(unfollow.destroyed?).to be true - end - end - - describe '#following?' do - it 'returns true when the target is followed' do - subject.follow!(bob) - expect(subject.following?(bob)).to be true - end - - it 'returns false if the target is not followed' do - expect(subject.following?(bob)).to be false - end - end - end - - describe '#local?' do - it 'returns true when the account is local' do - account = Fabricate(:account, domain: nil) - expect(account.local?).to be true - end - - it 'returns false when the account is on a different domain' do - account = Fabricate(:account, domain: 'foreign.tld') - expect(account.local?).to be false - end - end - - describe 'Local domain user methods' do - around do |example| - before = Rails.configuration.x.local_domain - example.run - Rails.configuration.x.local_domain = before - end - - subject { Fabricate(:account, domain: nil, username: 'alice') } - - describe '#to_webfinger_s' do - it 'returns a webfinger string for the account' do - Rails.configuration.x.local_domain = 'example.com' - - expect(subject.to_webfinger_s).to eq 'acct:alice@example.com' - end - end - - describe '#local_username_and_domain' do - it 'returns the username and local domain for the account' do - Rails.configuration.x.local_domain = 'example.com' - - expect(subject.local_username_and_domain).to eq 'alice@example.com' - end - end - end - - describe '#acct' do - it 'returns username for local users' do - account = Fabricate(:account, domain: nil, username: 'alice') - expect(account.acct).to eql 'alice' - end - - it 'returns username@domain for foreign users' do - account = Fabricate(:account, domain: 'foreign.tld', username: 'alice') - expect(account.acct).to eql 'alice@foreign.tld' - end - end - - describe '#save_with_optional_media!' do - before do - stub_request(:get, 'https://remote.test/valid_avatar').to_return(request_fixture('avatar.txt')) - stub_request(:get, 'https://remote.test/invalid_avatar').to_return(request_fixture('feed.txt')) - end - - let(:account) do - Fabricate(:account, - avatar_remote_url: 'https://remote.test/valid_avatar', - header_remote_url: 'https://remote.test/valid_avatar') - end - - let!(:expectation) { account.dup } - - context 'with valid properties' do - before do - account.save_with_optional_media! - end - - it 'unchanges avatar, header, avatar_remote_url, and header_remote_url' do - expect(account.avatar_remote_url).to eq expectation.avatar_remote_url - expect(account.header_remote_url).to eq expectation.header_remote_url - expect(account.avatar_file_name).to eq expectation.avatar_file_name - expect(account.header_file_name).to eq expectation.header_file_name - end - end - - context 'with invalid properties' do - before do - account.avatar_remote_url = 'https://remote.test/invalid_avatar' - account.save_with_optional_media! - end - - it 'sets default avatar, header, avatar_remote_url, and header_remote_url' do - expect(account.avatar_remote_url).to eq '' - expect(account.header_remote_url).to eq '' - expect(account.avatar_file_name).to eq nil - expect(account.header_file_name).to eq nil - end - end - end - - describe '#subscribed?' do - it 'returns false when no subscription expiration information is present' do - account = Fabricate(:account, subscription_expires_at: nil) - expect(account.subscribed?).to be false - end - - it 'returns true when subscription expiration has been set' do - account = Fabricate(:account, subscription_expires_at: 30.days.from_now) - expect(account.subscribed?).to be true - end - end - - describe '#possibly_stale?' do - let(:account) { Fabricate(:account, last_webfingered_at: last_webfingered_at) } - - context 'last_webfingered_at is nil' do - let(:last_webfingered_at) { nil } - - it 'returns true' do - expect(account.possibly_stale?).to be true - end - end - - context 'last_webfingered_at is more than 24 hours before' do - let(:last_webfingered_at) { 25.hours.ago } - - it 'returns true' do - expect(account.possibly_stale?).to be true - end - end - - context 'last_webfingered_at is less than 24 hours before' do - let(:last_webfingered_at) { 23.hours.ago } - - it 'returns false' do - expect(account.possibly_stale?).to be false - end - end - end - - describe '#refresh!' do - let(:account) { Fabricate(:account, domain: domain) } - let(:acct) { account.acct } - - context 'domain is nil' do - let(:domain) { nil } - - it 'returns nil' do - expect(account.refresh!).to be_nil - end - - it 'calls not ResolveAccountService#call' do - expect_any_instance_of(ResolveAccountService).not_to receive(:call).with(acct) - account.refresh! - end - end - - context 'domain is present' do - let(:domain) { 'example.com' } - - it 'calls ResolveAccountService#call' do - expect_any_instance_of(ResolveAccountService).to receive(:call).with(acct).once - account.refresh! - end - end - end - - describe '#to_param' do - it 'returns username' do - account = Fabricate(:account, username: 'alice') - expect(account.to_param).to eq 'alice' - end - end - - describe '#keypair' do - it 'returns an RSA key pair' do - account = Fabricate(:account) - expect(account.keypair).to be_instance_of OpenSSL::PKey::RSA - end - end - - describe '#subscription' do - it 'returns an OStatus subscription' do - account = Fabricate(:account) - expect(account.subscription('')).to be_instance_of OStatus2::Subscription - end - end - - describe '#object_type' do - it 'is always a person' do - account = Fabricate(:account) - expect(account.object_type).to be :person - end - end - - describe '#favourited?' do - let(:original_status) do - author = Fabricate(:account, username: 'original') - Fabricate(:status, account: author) - end - - subject { Fabricate(:account) } - - context 'when the status is a reblog of another status' do - let(:original_reblog) do - author = Fabricate(:account, username: 'original_reblogger') - Fabricate(:status, reblog: original_status, account: author) - end - - it 'is is true when this account has favourited it' do - Fabricate(:favourite, status: original_reblog, account: subject) - - expect(subject.favourited?(original_status)).to eq true - end - - it 'is false when this account has not favourited it' do - expect(subject.favourited?(original_status)).to eq false - end - end - - context 'when the status is an original status' do - it 'is is true when this account has favourited it' do - Fabricate(:favourite, status: original_status, account: subject) - - expect(subject.favourited?(original_status)).to eq true - end - - it 'is false when this account has not favourited it' do - expect(subject.favourited?(original_status)).to eq false - end - end - end - - describe '#reblogged?' do - let(:original_status) do - author = Fabricate(:account, username: 'original') - Fabricate(:status, account: author) - end - - subject { Fabricate(:account) } - - context 'when the status is a reblog of another status' do - let(:original_reblog) do - author = Fabricate(:account, username: 'original_reblogger') - Fabricate(:status, reblog: original_status, account: author) - end - - it 'is true when this account has reblogged it' do - Fabricate(:status, reblog: original_reblog, account: subject) - - expect(subject.reblogged?(original_reblog)).to eq true - end - - it 'is false when this account has not reblogged it' do - expect(subject.reblogged?(original_reblog)).to eq false - end - end - - context 'when the status is an original status' do - it 'is true when this account has reblogged it' do - Fabricate(:status, reblog: original_status, account: subject) - - expect(subject.reblogged?(original_status)).to eq true - end - - it 'is false when this account has not reblogged it' do - expect(subject.reblogged?(original_status)).to eq false - end - end - end - - describe '#excluded_from_timeline_account_ids' do - it 'includes account ids of blockings, blocked_bys and mutes' do - account = Fabricate(:account) - block = Fabricate(:block, account: account) - mute = Fabricate(:mute, account: account) - block_by = Fabricate(:block, target_account: account) - - results = account.excluded_from_timeline_account_ids - expect(results.size).to eq 3 - expect(results).to include(block.target_account.id) - expect(results).to include(mute.target_account.id) - expect(results).to include(block_by.account.id) - end - end - - describe '#excluded_from_timeline_domains' do - it 'returns the domains blocked by the account' do - account = Fabricate(:account) - account.block_domain!('domain') - expect(account.excluded_from_timeline_domains).to match_array ['domain'] - end - end - - describe '.search_for' do - before do - _missing = Fabricate( - :account, - display_name: "Missing", - username: "missing", - domain: "missing.com" - ) - end - - it 'accepts ?, \, : and space as delimiter' do - match = Fabricate( - :account, - display_name: 'A & l & i & c & e', - username: 'username', - domain: 'example.com' - ) - - results = Account.search_for('A?l\i:c e') - expect(results).to eq [match] - end - - it 'finds accounts with matching display_name' do - match = Fabricate( - :account, - display_name: "Display Name", - username: "username", - domain: "example.com" - ) - - results = Account.search_for("display") - expect(results).to eq [match] - end - - it 'finds accounts with matching username' do - match = Fabricate( - :account, - display_name: "Display Name", - username: "username", - domain: "example.com" - ) - - results = Account.search_for("username") - expect(results).to eq [match] - end - - it 'finds accounts with matching domain' do - match = Fabricate( - :account, - display_name: "Display Name", - username: "username", - domain: "example.com" - ) - - results = Account.search_for("example") - expect(results).to eq [match] - end - - it 'limits by 10 by default' do - 11.times.each { Fabricate(:account, display_name: "Display Name") } - results = Account.search_for("display") - expect(results.size).to eq 10 - end - - it 'accepts arbitrary limits' do - 2.times.each { Fabricate(:account, display_name: "Display Name") } - results = Account.search_for("display", 1) - expect(results.size).to eq 1 - end - - it 'ranks multiple matches higher' do - matches = [ - { username: "username", display_name: "username" }, - { display_name: "Display Name", username: "username", domain: "example.com" }, - ].map(&method(:Fabricate).curry(2).call(:account)) - - results = Account.search_for("username") - expect(results).to eq matches - end - end - - describe '.advanced_search_for' do - it 'accepts ?, \, : and space as delimiter' do - account = Fabricate(:account) - match = Fabricate( - :account, - display_name: 'A & l & i & c & e', - username: 'username', - domain: 'example.com' - ) - - results = Account.advanced_search_for('A?l\i:c e', account) - expect(results).to eq [match] - end - - it 'limits by 10 by default' do - 11.times { Fabricate(:account, display_name: "Display Name") } - results = Account.search_for("display") - expect(results.size).to eq 10 - end - - it 'accepts arbitrary limits' do - 2.times { Fabricate(:account, display_name: "Display Name") } - results = Account.search_for("display", 1) - expect(results.size).to eq 1 - end - - it 'ranks followed accounts higher' do - account = Fabricate(:account) - match = Fabricate(:account, username: "Matching") - followed_match = Fabricate(:account, username: "Matcher") - Fabricate(:follow, account: account, target_account: followed_match) - - results = Account.advanced_search_for("match", account) - expect(results).to eq [followed_match, match] - expect(results.first.rank).to be > results.last.rank - end - end - - describe '.domains' do - it 'returns domains' do - Fabricate(:account, domain: 'domain') - expect(Account.domains).to match_array(['domain']) - end - end - - describe '#statuses_count' do - subject { Fabricate(:account) } - - it 'counts statuses' do - Fabricate(:status, account: subject) - Fabricate(:status, account: subject) - expect(subject.statuses_count).to eq 2 - end - - it 'does not count direct statuses' do - Fabricate(:status, account: subject, visibility: :direct) - expect(subject.statuses_count).to eq 0 - end - - it 'is decremented when status is removed' do - status = Fabricate(:status, account: subject) - expect(subject.statuses_count).to eq 1 - status.destroy - expect(subject.statuses_count).to eq 0 - end - - it 'is decremented when status is removed when account is not preloaded' do - status = Fabricate(:status, account: subject) - expect(subject.reload.statuses_count).to eq 1 - clean_status = Status.find(status.id) - expect(clean_status.association(:account).loaded?).to be false - clean_status.destroy - expect(subject.reload.statuses_count).to eq 0 - end - end - - describe '.following_map' do - it 'returns an hash' do - expect(Account.following_map([], 1)).to be_a Hash - end - end - - describe '.followed_by_map' do - it 'returns an hash' do - expect(Account.followed_by_map([], 1)).to be_a Hash - end - end - - describe '.blocking_map' do - it 'returns an hash' do - expect(Account.blocking_map([], 1)).to be_a Hash - end - end - - describe '.requested_map' do - it 'returns an hash' do - expect(Account.requested_map([], 1)).to be_a Hash - end - end - - describe 'MENTION_RE' do - subject { Account::MENTION_RE } - - it 'matches usernames in the middle of a sentence' do - expect(subject.match('Hello to @alice from me')[1]).to eq 'alice' - end - - it 'matches usernames in the beginning of status' do - expect(subject.match('@alice Hey how are you?')[1]).to eq 'alice' - end - - it 'matches full usernames' do - expect(subject.match('@alice@example.com')[1]).to eq 'alice@example.com' - end - - it 'matches full usernames with a dot at the end' do - expect(subject.match('Hello @alice@example.com.')[1]).to eq 'alice@example.com' - end - - it 'matches dot-prepended usernames' do - expect(subject.match('.@alice I want everybody to see this')[1]).to eq 'alice' - end - - it 'does not match e-mails' do - expect(subject.match('Drop me an e-mail at alice@example.com')).to be_nil - end - - it 'does not match URLs' do - expect(subject.match('Check this out https://medium.com/@alice/some-article#.abcdef123')).to be_nil - end - - xit 'does not match URL querystring' do - expect(subject.match('https://example.com/?x=@alice')).to be_nil - end - end - - describe 'validations' do - it 'has a valid fabricator' do - account = Fabricate.build(:account) - account.valid? - expect(account).to be_valid - end - - it 'is invalid without a username' do - account = Fabricate.build(:account, username: nil) - account.valid? - expect(account).to model_have_error_on_field(:username) - end - - it 'squishes the username before validation' do - account = Fabricate(:account, domain: nil, username: " \u3000bob \t \u00a0 \n ") - expect(account.username).to eq 'bob' - end - - context 'when is local' do - it 'is invalid if the username is not unique in case-insensitive comparison among local accounts' do - account_1 = Fabricate(:account, username: 'the_doctor') - account_2 = Fabricate.build(:account, username: 'the_Doctor') - account_2.valid? - expect(account_2).to model_have_error_on_field(:username) - end - - it 'is invalid if the username is reserved' do - account = Fabricate.build(:account, username: 'support') - account.valid? - expect(account).to model_have_error_on_field(:username) - end - - it 'is valid when username is reserved but record has already been created' do - account = Fabricate.build(:account, username: 'support') - account.save(validate: false) - expect(account.valid?).to be true - end - - it 'is invalid if the username doesn\'t only contains letters, numbers and underscores' do - account = Fabricate.build(:account, username: 'the-doctor') - account.valid? - expect(account).to model_have_error_on_field(:username) - end - - it 'is invalid if the username is longer then 30 characters' do - account = Fabricate.build(:account, username: Faker::Lorem.characters(31)) - account.valid? - expect(account).to model_have_error_on_field(:username) - end - - it 'is invalid if the display name is longer than 30 characters' do - account = Fabricate.build(:account, display_name: Faker::Lorem.characters(31)) - account.valid? - expect(account).to model_have_error_on_field(:display_name) - end - - it 'is invalid if the note is longer than 500 characters' do - account = Fabricate.build(:account, note: Faker::Lorem.characters(501)) - account.valid? - expect(account).to model_have_error_on_field(:note) - end - end - - context 'when is remote' do - it 'is invalid if the username is not unique in case-sensitive comparison among accounts in the same normalized domain' do - Fabricate(:account, domain: 'ã«ã‚ƒã‚“', username: 'username') - account = Fabricate.build(:account, domain: 'xn--r9j5b5b', username: 'username') - account.valid? - expect(account).to model_have_error_on_field(:username) - end - - it 'is valid even if the username is unique only in case-sensitive comparison among accounts in the same normalized domain' do - Fabricate(:account, domain: 'ã«ã‚ƒã‚“', username: 'username') - account = Fabricate.build(:account, domain: 'xn--r9j5b5b', username: 'Username') - account.valid? - expect(account).not_to model_have_error_on_field(:username) - end - - it 'is valid even if the username contains hyphens' do - account = Fabricate.build(:account, domain: 'domain', username: 'the-doctor') - account.valid? - expect(account).to_not model_have_error_on_field(:username) - end - - it 'is invalid if the username doesn\'t only contains letters, numbers, underscores and hyphens' do - account = Fabricate.build(:account, domain: 'domain', username: 'the doctor') - account.valid? - expect(account).to model_have_error_on_field(:username) - end - - it 'is valid even if the username is longer then 30 characters' do - account = Fabricate.build(:account, domain: 'domain', username: Faker::Lorem.characters(31)) - account.valid? - expect(account).not_to model_have_error_on_field(:username) - end - - it 'is valid even if the display name is longer than 30 characters' do - account = Fabricate.build(:account, domain: 'domain', display_name: Faker::Lorem.characters(31)) - account.valid? - expect(account).not_to model_have_error_on_field(:display_name) - end - - it 'is valid even if the note is longer than 500 characters' do - account = Fabricate.build(:account, domain: 'domain', note: Faker::Lorem.characters(501)) - account.valid? - expect(account).not_to model_have_error_on_field(:note) - end - end - end - - describe 'scopes' do - describe 'alphabetic' do - it 'sorts by alphabetic order of domain and username' do - matches = [ - { username: 'a', domain: 'a' }, - { username: 'b', domain: 'a' }, - { username: 'a', domain: 'b' }, - { username: 'b', domain: 'b' }, - ].map(&method(:Fabricate).curry(2).call(:account)) - - expect(Account.alphabetic).to eq matches - end - end - - describe 'matches_display_name' do - it 'matches display name which starts with the given string' do - match = Fabricate(:account, display_name: 'pattern and suffix') - Fabricate(:account, display_name: 'prefix and pattern') - - expect(Account.matches_display_name('pattern')).to eq [match] - end - end - - describe 'matches_username' do - it 'matches display name which starts with the given string' do - match = Fabricate(:account, username: 'pattern_and_suffix') - Fabricate(:account, username: 'prefix_and_pattern') - - expect(Account.matches_username('pattern')).to eq [match] - end - end - - describe 'expiring' do - it 'returns remote accounts with followers whose subscription expiration date is past or not given' do - local = Fabricate(:account, domain: nil) - matches = [ - { domain: 'remote', subscription_expires_at: '2000-01-01T00:00:00Z' }, - ].map(&method(:Fabricate).curry(2).call(:account)) - matches.each(&local.method(:follow!)) - Fabricate(:account, domain: 'remote', subscription_expires_at: nil) - local.follow!(Fabricate(:account, domain: 'remote', subscription_expires_at: '2000-01-03T00:00:00Z')) - local.follow!(Fabricate(:account, domain: nil, subscription_expires_at: nil)) - - expect(Account.expiring('2000-01-02T00:00:00Z').recent).to eq matches.reverse - end - end - - describe 'remote' do - it 'returns an array of accounts who have a domain' do - account_1 = Fabricate(:account, domain: nil) - account_2 = Fabricate(:account, domain: 'example.com') - expect(Account.remote).to match_array([account_2]) - end - end - - describe 'by_domain_accounts' do - it 'returns accounts grouped by domain sorted by accounts' do - 2.times { Fabricate(:account, domain: 'example.com') } - Fabricate(:account, domain: 'example2.com') - - results = Account.by_domain_accounts - expect(results.length).to eq 2 - expect(results.first.domain).to eq 'example.com' - expect(results.first.accounts_count).to eq 2 - expect(results.last.domain).to eq 'example2.com' - expect(results.last.accounts_count).to eq 1 - end - end - - describe 'local' do - it 'returns an array of accounts who do not have a domain' do - account_1 = Fabricate(:account, domain: nil) - account_2 = Fabricate(:account, domain: 'example.com') - expect(Account.local).to match_array([account_1]) - end - end - - describe 'partitioned' do - it 'returns a relation of accounts partitioned by domain' do - matches = ['a', 'b', 'a', 'b'] - matches.size.times.to_a.shuffle.each do |index| - matches[index] = Fabricate(:account, domain: matches[index]) - end - - expect(Account.partitioned).to match_array(matches) - end - end - - describe 'recent' do - it 'returns a relation of accounts sorted by recent creation' do - matches = 2.times.map { Fabricate(:account) } - expect(Account.recent).to match_array(matches) - end - end - - describe 'silenced' do - it 'returns an array of accounts who are silenced' do - account_1 = Fabricate(:account, silenced: true) - account_2 = Fabricate(:account, silenced: false) - expect(Account.silenced).to match_array([account_1]) - end - end - - describe 'suspended' do - it 'returns an array of accounts who are suspended' do - account_1 = Fabricate(:account, suspended: true) - account_2 = Fabricate(:account, suspended: false) - expect(Account.suspended).to match_array([account_1]) - end - end - end - - context 'when is local' do - # Test disabled because test environment omits autogenerating keys for performance - xit 'generates keys' do - account = Account.create!(domain: nil, username: Faker::Internet.user_name(nil, ['_'])) - expect(account.keypair.private?).to eq true - end - end - - context 'when is remote' do - it 'does not generate keys' do - key = OpenSSL::PKey::RSA.new(1024).public_key - account = Account.create!(domain: 'remote', username: Faker::Internet.user_name(nil, ['_']), public_key: key.to_pem) - expect(account.keypair.params).to eq key.params - end - - it 'normalizes domain' do - account = Account.create!(domain: 'ã«ã‚ƒã‚“', username: Faker::Internet.user_name(nil, ['_'])) - expect(account.domain).to eq 'xn--r9j5b5b' - end - end - - include_examples 'AccountAvatar', :account -end diff --git a/spec/models/account_stat_spec.rb b/spec/models/account_stat_spec.rb deleted file mode 100644 index a9418510..00000000 --- a/spec/models/account_stat_spec.rb +++ /dev/null @@ -1,4 +0,0 @@ -require 'rails_helper' - -RSpec.describe AccountStat, type: :model do -end diff --git a/spec/models/account_tag_stat_spec.rb b/spec/models/account_tag_stat_spec.rb deleted file mode 100644 index 6d3057f3..00000000 --- a/spec/models/account_tag_stat_spec.rb +++ /dev/null @@ -1,38 +0,0 @@ -# frozen_string_literal: true - -require 'rails_helper' - -RSpec.describe AccountTagStat, type: :model do - key = 'accounts_count' - let(:account_tag_stat) { Fabricate(:tag).account_tag_stat } - - describe '#increment_count!' do - it 'calls #update' do - args = { key => account_tag_stat.public_send(key) + 1 } - expect(account_tag_stat).to receive(:update).with(args) - account_tag_stat.increment_count!(key) - end - - it 'increments value by 1' do - expect do - account_tag_stat.increment_count!(key) - end.to change { account_tag_stat.accounts_count }.by(1) - end - end - - describe '#decrement_count!' do - it 'calls #update' do - args = { key => [account_tag_stat.public_send(key) - 1, 0].max } - expect(account_tag_stat).to receive(:update).with(args) - account_tag_stat.decrement_count!(key) - end - - it 'decrements value by 1' do - account_tag_stat.update(key => 1) - - expect do - account_tag_stat.decrement_count!(key) - end.to change { account_tag_stat.accounts_count }.by(-1) - end - end -end diff --git a/spec/models/admin/account_action_spec.rb b/spec/models/admin/account_action_spec.rb deleted file mode 100644 index a3db60cf..00000000 --- a/spec/models/admin/account_action_spec.rb +++ /dev/null @@ -1,131 +0,0 @@ -require 'rails_helper' - -RSpec.describe Admin::AccountAction, type: :model do - let(:account_action) { described_class.new } - - describe '#save!' do - subject { account_action.save! } - let(:account) { Fabricate(:account, user: Fabricate(:user, admin: true)) } - let(:target_account) { Fabricate(:account, user: Fabricate(:user)) } - let(:type) { 'disable' } - - before do - account_action.assign_attributes( - type: type, - current_account: account, - target_account: target_account - ) - end - - context 'type is "disable"' do - let(:type) { 'disable' } - - it 'disable user' do - subject - expect(target_account.user).to be_disabled - end - end - - context 'type is "silence"' do - let(:type) { 'silence' } - - it 'silences account' do - subject - expect(target_account).to be_silenced - end - end - - context 'type is "suspend"' do - let(:type) { 'suspend' } - - it 'suspends account' do - subject - expect(target_account).to be_suspended - end - - it 'queues Admin::SuspensionWorker by 1' do - Sidekiq::Testing.fake! do - expect do - subject - end.to change { Admin::SuspensionWorker.jobs.size }.by 1 - end - end - end - - it 'creates Admin::ActionLog' do - expect do - subject - end.to change { Admin::ActionLog.count }.by 1 - end - - it 'calls queue_email!' do - expect(account_action).to receive(:queue_email!) - subject - end - - it 'calls process_reports!' do - expect(account_action).to receive(:process_reports!) - subject - end - end - - describe '#report' do - subject { account_action.report } - - context 'report_id.present?' do - before do - account_action.report_id = Fabricate(:report).id - end - - it 'returns Report' do - expect(subject).to be_instance_of Report - end - end - - context '!report_id.present?' do - it 'returns nil' do - expect(subject).to be_nil - end - end - end - - describe '#with_report?' do - subject { account_action.with_report? } - - context '!report.nil?' do - before do - account_action.report_id = Fabricate(:report).id - end - - it 'returns true' do - expect(subject).to be true - end - end - - context '!(!report.nil?)' do - it 'returns false' do - expect(subject).to be false - end - end - end - - describe '.types_for_account' do - subject { described_class.types_for_account(account) } - - context 'account.local?' do - let(:account) { Fabricate(:account, domain: nil) } - - it 'returns ["none", "disable", "silence", "suspend"]' do - expect(subject).to eq %w(none disable silence suspend) - end - end - - context '!account.local?' do - let(:account) { Fabricate(:account, domain: 'hoge.com') } - - it 'returns ["silence", "suspend"]' do - expect(subject).to eq %w(silence suspend) - end - end - end -end diff --git a/spec/models/admin/action_log_spec.rb b/spec/models/admin/action_log_spec.rb deleted file mode 100644 index 3495cc51..00000000 --- a/spec/models/admin/action_log_spec.rb +++ /dev/null @@ -1,12 +0,0 @@ -# frozen_string_literal: true - -require 'rails_helper' - -RSpec.describe Admin::ActionLog, type: :model do - describe '#action' do - it 'returns action' do - action_log = described_class.new(action: 'hoge') - expect(action_log.action).to be :hoge - end - end -end diff --git a/spec/models/backup_spec.rb b/spec/models/backup_spec.rb deleted file mode 100644 index 45230986..00000000 --- a/spec/models/backup_spec.rb +++ /dev/null @@ -1,4 +0,0 @@ -require 'rails_helper' - -RSpec.describe Backup, type: :model do -end diff --git a/spec/models/block_spec.rb b/spec/models/block_spec.rb deleted file mode 100644 index acbdc77f..00000000 --- a/spec/models/block_spec.rb +++ /dev/null @@ -1,47 +0,0 @@ -require 'rails_helper' - -RSpec.describe Block, type: :model do - describe 'validations' do - it 'has a valid fabricator' do - block = Fabricate.build(:block) - expect(block).to be_valid - end - - it 'is invalid without an account' do - block = Fabricate.build(:block, account: nil) - block.valid? - expect(block).to model_have_error_on_field(:account) - end - - it 'is invalid without a target_account' do - block = Fabricate.build(:block, target_account: nil) - block.valid? - expect(block).to model_have_error_on_field(:target_account) - end - end - - it 'removes blocking cache after creation' do - account = Fabricate(:account) - target_account = Fabricate(:account) - Rails.cache.write("exclude_account_ids_for:#{account.id}", []) - Rails.cache.write("exclude_account_ids_for:#{target_account.id}", []) - - Block.create!(account: account, target_account: target_account) - - expect(Rails.cache.exist?("exclude_account_ids_for:#{account.id}")).to eq false - expect(Rails.cache.exist?("exclude_account_ids_for:#{target_account.id}")).to eq false - end - - it 'removes blocking cache after destruction' do - account = Fabricate(:account) - target_account = Fabricate(:account) - block = Block.create!(account: account, target_account: target_account) - Rails.cache.write("exclude_account_ids_for:#{account.id}", [target_account.id]) - Rails.cache.write("exclude_account_ids_for:#{target_account.id}", [account.id]) - - block.destroy! - - expect(Rails.cache.exist?("exclude_account_ids_for:#{account.id}")).to eq false - expect(Rails.cache.exist?("exclude_account_ids_for:#{target_account.id}")).to eq false - end -end diff --git a/spec/models/concerns/account_finder_concern_spec.rb b/spec/models/concerns/account_finder_concern_spec.rb deleted file mode 100644 index 7b1c1155..00000000 --- a/spec/models/concerns/account_finder_concern_spec.rb +++ /dev/null @@ -1,109 +0,0 @@ -# frozen_string_literal: true - -require 'rails_helper' - -describe AccountFinderConcern do - describe 'local finders' do - before do - @account = Fabricate(:account, username: 'Alice') - end - - describe '.find_local' do - it 'returns case-insensitive result' do - expect(Account.find_local('alice')).to eq(@account) - end - - it 'returns correctly cased result' do - expect(Account.find_local('Alice')).to eq(@account) - end - - it 'returns nil without a match' do - expect(Account.find_local('a_ice')).to be_nil - end - - it 'returns nil for regex style username value' do - expect(Account.find_local('al%')).to be_nil - end - - it 'returns nil for nil username value' do - expect(Account.find_local(nil)).to be_nil - end - - it 'returns nil for blank username value' do - expect(Account.find_local('')).to be_nil - end - end - - describe '.find_local!' do - it 'returns matching result' do - expect(Account.find_local!('alice')).to eq(@account) - end - - it 'raises on non-matching result' do - expect { Account.find_local!('missing') }.to raise_error(ActiveRecord::RecordNotFound) - end - - it 'raises with blank username' do - expect { Account.find_local!('') }.to raise_error(ActiveRecord::RecordNotFound) - end - - it 'raises with nil username' do - expect { Account.find_local!(nil) }.to raise_error(ActiveRecord::RecordNotFound) - end - end - end - - describe 'remote finders' do - before do - @account = Fabricate(:account, username: 'Alice', domain: 'gab.com') - end - - describe '.find_remote' do - it 'returns exact match result' do - expect(Account.find_remote('alice', 'gab.com')).to eq(@account) - end - - it 'returns case-insensitive result' do - expect(Account.find_remote('ALICE', 'GAB.COM')).to eq(@account) - end - - it 'returns nil when username does not match' do - expect(Account.find_remote('a_ice', 'gab.com')).to be_nil - end - - it 'returns nil when domain does not match' do - expect(Account.find_remote('alice', 'g_b.com')).to be_nil - end - - it 'returns nil for regex style domain value' do - expect(Account.find_remote('alice', 'm%')).to be_nil - end - - it 'returns nil for nil username value' do - expect(Account.find_remote(nil, 'domain')).to be_nil - end - - it 'returns nil for blank username value' do - expect(Account.find_remote('', 'domain')).to be_nil - end - end - - describe '.find_remote!' do - it 'returns matching result' do - expect(Account.find_remote!('alice', 'gab.com')).to eq(@account) - end - - it 'raises on non-matching result' do - expect { Account.find_remote!('missing', 'gab.host') }.to raise_error(ActiveRecord::RecordNotFound) - end - - it 'raises with blank username' do - expect { Account.find_remote!('', '') }.to raise_error(ActiveRecord::RecordNotFound) - end - - it 'raises with nil username' do - expect { Account.find_remote!(nil, nil) }.to raise_error(ActiveRecord::RecordNotFound) - end - end - end -end diff --git a/spec/models/concerns/account_interactions_spec.rb b/spec/models/concerns/account_interactions_spec.rb deleted file mode 100644 index e8ef61f6..00000000 --- a/spec/models/concerns/account_interactions_spec.rb +++ /dev/null @@ -1,613 +0,0 @@ -require 'rails_helper' - -describe AccountInteractions do - let(:account) { Fabricate(:account, username: 'account') } - let(:account_id) { account.id } - let(:account_ids) { [account_id] } - let(:target_account) { Fabricate(:account, username: 'target') } - let(:target_account_id) { target_account.id } - let(:target_account_ids) { [target_account_id] } - - describe '.following_map' do - subject { Account.following_map(target_account_ids, account_id) } - - context 'account with Follow' do - it 'returns { target_account_id => true }' do - Fabricate(:follow, account: account, target_account: target_account) - is_expected.to eq(target_account_id => { reblogs: true }) - end - end - - context 'account without Follow' do - it 'returns {}' do - is_expected.to eq({}) - end - end - end - - describe '.followed_by_map' do - subject { Account.followed_by_map(target_account_ids, account_id) } - - context 'account with Follow' do - it 'returns { target_account_id => true }' do - Fabricate(:follow, account: target_account, target_account: account) - is_expected.to eq(target_account_id => true) - end - end - - context 'account without Follow' do - it 'returns {}' do - is_expected.to eq({}) - end - end - end - - describe '.blocking_map' do - subject { Account.blocking_map(target_account_ids, account_id) } - - context 'account with Block' do - it 'returns { target_account_id => true }' do - Fabricate(:block, account: account, target_account: target_account) - is_expected.to eq(target_account_id => true) - end - end - - context 'account without Block' do - it 'returns {}' do - is_expected.to eq({}) - end - end - end - - describe '.muting_map' do - subject { Account.muting_map(target_account_ids, account_id) } - - context 'account with Mute' do - before do - Fabricate(:mute, target_account: target_account, account: account, hide_notifications: hide) - end - - context 'if Mute#hide_notifications?' do - let(:hide) { true } - - it 'returns { target_account_id => { notifications: true } }' do - is_expected.to eq(target_account_id => { notifications: true }) - end - end - - context 'unless Mute#hide_notifications?' do - let(:hide) { false } - - it 'returns { target_account_id => { notifications: false } }' do - is_expected.to eq(target_account_id => { notifications: false }) - end - end - end - - context 'account without Mute' do - it 'returns {}' do - is_expected.to eq({}) - end - end - end - - describe '#follow!' do - it 'creates and returns Follow' do - expect do - expect(account.follow!(target_account)).to be_kind_of Follow - end.to change { account.following.count }.by 1 - end - end - - describe '#block' do - it 'creates and returns Block' do - expect do - expect(account.block!(target_account)).to be_kind_of Block - end.to change { account.block_relationships.count }.by 1 - end - end - - describe '#mute!' do - subject { account.mute!(target_account, notifications: arg_notifications) } - - context 'Mute does not exist yet' do - context 'arg :notifications is nil' do - let(:arg_notifications) { nil } - - it 'creates Mute, and returns Mute' do - expect do - expect(subject).to be_kind_of Mute - end.to change { account.mute_relationships.count }.by 1 - end - end - - context 'arg :notifications is false' do - let(:arg_notifications) { false } - - it 'creates Mute, and returns Mute' do - expect do - expect(subject).to be_kind_of Mute - end.to change { account.mute_relationships.count }.by 1 - end - end - - context 'arg :notifications is true' do - let(:arg_notifications) { true } - - it 'creates Mute, and returns Mute' do - expect do - expect(subject).to be_kind_of Mute - end.to change { account.mute_relationships.count }.by 1 - end - end - end - - context 'Mute already exists' do - before do - account.mute_relationships << mute - end - - let(:mute) do - Fabricate(:mute, - account: account, - target_account: target_account, - hide_notifications: hide_notifications) - end - - context 'mute.hide_notifications is true' do - let(:hide_notifications) { true } - - context 'arg :notifications is nil' do - let(:arg_notifications) { nil } - - it 'returns Mute without updating mute.hide_notifications' do - expect do - expect(subject).to be_kind_of Mute - end.not_to change { mute.reload.hide_notifications? }.from(true) - end - end - - context 'arg :notifications is false' do - let(:arg_notifications) { false } - - it 'returns Mute, and updates mute.hide_notifications false' do - expect do - expect(subject).to be_kind_of Mute - end.to change { mute.reload.hide_notifications? }.from(true).to(false) - end - end - - context 'arg :notifications is true' do - let(:arg_notifications) { true } - - it 'returns Mute without updating mute.hide_notifications' do - expect do - expect(subject).to be_kind_of Mute - end.not_to change { mute.reload.hide_notifications? }.from(true) - end - end - end - - context 'mute.hide_notifications is false' do - let(:hide_notifications) { false } - - context 'arg :notifications is nil' do - let(:arg_notifications) { nil } - - it 'returns Mute, and updates mute.hide_notifications true' do - expect do - expect(subject).to be_kind_of Mute - end.to change { mute.reload.hide_notifications? }.from(false).to(true) - end - end - - context 'arg :notifications is false' do - let(:arg_notifications) { false } - - it 'returns Mute without updating mute.hide_notifications' do - expect do - expect(subject).to be_kind_of Mute - end.not_to change { mute.reload.hide_notifications? }.from(false) - end - end - - context 'arg :notifications is true' do - let(:arg_notifications) { true } - - it 'returns Mute, and updates mute.hide_notifications true' do - expect do - expect(subject).to be_kind_of Mute - end.to change { mute.reload.hide_notifications? }.from(false).to(true) - end - end - end - end - end - - describe '#mute_conversation!' do - let(:conversation) { Fabricate(:conversation) } - - subject { account.mute_conversation!(conversation) } - - it 'creates and returns ConversationMute' do - expect do - is_expected.to be_kind_of ConversationMute - end.to change { account.conversation_mutes.count }.by 1 - end - end - - describe '#block_domain!' do - let(:domain) { 'example.com' } - - subject { account.block_domain!(domain) } - - it 'creates and returns AccountDomainBlock' do - expect do - is_expected.to be_kind_of AccountDomainBlock - end.to change { account.domain_blocks.count }.by 1 - end - end - - describe '#unfollow!' do - subject { account.unfollow!(target_account) } - - context 'following target_account' do - it 'returns destroyed Follow' do - account.active_relationships.create(target_account: target_account) - is_expected.to be_kind_of Follow - expect(subject).to be_destroyed - end - end - - context 'not following target_account' do - it 'returns nil' do - is_expected.to be_nil - end - end - end - - describe '#unblock!' do - subject { account.unblock!(target_account) } - - context 'blocking target_account' do - it 'returns destroyed Block' do - account.block_relationships.create(target_account: target_account) - is_expected.to be_kind_of Block - expect(subject).to be_destroyed - end - end - - context 'not blocking target_account' do - it 'returns nil' do - is_expected.to be_nil - end - end - end - - describe '#unmute!' do - subject { account.unmute!(target_account) } - - context 'muting target_account' do - it 'returns destroyed Mute' do - account.mute_relationships.create(target_account: target_account) - is_expected.to be_kind_of Mute - expect(subject).to be_destroyed - end - end - - context 'not muting target_account' do - it 'returns nil' do - is_expected.to be_nil - end - end - end - - describe '#unmute_conversation!' do - let(:conversation) { Fabricate(:conversation) } - - subject { account.unmute_conversation!(conversation) } - - context 'muting the conversation' do - it 'returns destroyed ConversationMute' do - account.conversation_mutes.create(conversation: conversation) - is_expected.to be_kind_of ConversationMute - expect(subject).to be_destroyed - end - end - - context 'not muting the conversation' do - it 'returns nil' do - is_expected.to be nil - end - end - end - - describe '#unblock_domain!' do - let(:domain) { 'example.com' } - - subject { account.unblock_domain!(domain) } - - context 'blocking the domain' do - it 'returns destroyed AccountDomainBlock' do - account_domain_block = Fabricate(:account_domain_block, domain: domain) - account.domain_blocks << account_domain_block - is_expected.to be_kind_of AccountDomainBlock - expect(subject).to be_destroyed - end - end - - context 'unblocking the domain' do - it 'returns nil' do - is_expected.to be_nil - end - end - end - - describe '#following?' do - subject { account.following?(target_account) } - - context 'following target_account' do - it 'returns true' do - account.active_relationships.create(target_account: target_account) - is_expected.to be true - end - end - - context 'not following target_account' do - it 'returns false' do - is_expected.to be false - end - end - end - - describe '#blocking?' do - subject { account.blocking?(target_account) } - - context 'blocking target_account' do - it 'returns true' do - account.block_relationships.create(target_account: target_account) - is_expected.to be true - end - end - - context 'not blocking target_account' do - it 'returns false' do - is_expected.to be false - end - end - end - - describe '#domain_blocking?' do - let(:domain) { 'example.com' } - - subject { account.domain_blocking?(domain) } - - context 'blocking the domain' do - it' returns true' do - account_domain_block = Fabricate(:account_domain_block, domain: domain) - account.domain_blocks << account_domain_block - is_expected.to be true - end - end - - context 'not blocking the domain' do - it 'returns false' do - is_expected.to be false - end - end - end - - describe '#muting?' do - subject { account.muting?(target_account) } - - context 'muting target_account' do - it 'returns true' do - mute = Fabricate(:mute, account: account, target_account: target_account) - account.mute_relationships << mute - is_expected.to be true - end - end - - context 'not muting target_account' do - it 'returns false' do - is_expected.to be false - end - end - end - - describe '#muting_conversation?' do - let(:conversation) { Fabricate(:conversation) } - - subject { account.muting_conversation?(conversation) } - - context 'muting the conversation' do - it 'returns true' do - account.conversation_mutes.create(conversation: conversation) - is_expected.to be true - end - end - - context 'not muting the conversation' do - it 'returns false' do - is_expected.to be false - end - end - end - - describe '#muting_notifications?' do - before do - mute = Fabricate(:mute, target_account: target_account, account: account, hide_notifications: hide) - account.mute_relationships << mute - end - - subject { account.muting_notifications?(target_account) } - - context 'muting notifications of target_account' do - let(:hide) { true } - - it 'returns true' do - is_expected.to be true - end - end - - context 'not muting notifications of target_account' do - let(:hide) { false } - - it 'returns false' do - is_expected.to be false - end - end - end - - describe '#requested?' do - subject { account.requested?(target_account) } - - context 'requested by target_account' do - it 'returns true' do - Fabricate(:follow_request, account: account, target_account: target_account) - is_expected.to be true - end - end - - context 'not requested by target_account' do - it 'returns false' do - is_expected.to be false - end - end - end - - describe '#favourited?' do - let(:status) { Fabricate(:status, account: account, favourites: favourites) } - - subject { account.favourited?(status) } - - context 'favorited' do - let(:favourites) { [Fabricate(:favourite, account: account)] } - - it 'returns true' do - is_expected.to be true - end - end - - context 'not favorited' do - let(:favourites) { [] } - - it 'returns false' do - is_expected.to be false - end - end - end - - describe '#reblogged?' do - let(:status) { Fabricate(:status, account: account, reblogs: reblogs) } - - subject { account.reblogged?(status) } - - context 'reblogged' do - let(:reblogs) { [Fabricate(:status, account: account)] } - - it 'returns true' do - is_expected.to be true - end - end - - context 'not reblogged' do - let(:reblogs) { [] } - - it 'returns false' do - is_expected.to be false - end - end - end - - describe '#pinned?' do - let(:status) { Fabricate(:status, account: account) } - - subject { account.pinned?(status) } - - context 'pinned' do - it 'returns true' do - Fabricate(:status_pin, account: account, status: status) - is_expected.to be true - end - end - - context 'not pinned' do - it 'returns false' do - is_expected.to be false - end - end - end - - describe 'muting an account' do - let(:me) { Fabricate(:account, username: 'Me') } - let(:you) { Fabricate(:account, username: 'You') } - - context 'with the notifications option unspecified' do - before do - me.mute!(you) - end - - it 'defaults to muting notifications' do - expect(me.muting_notifications?(you)).to be true - end - end - - context 'with the notifications option set to false' do - before do - me.mute!(you, notifications: false) - end - - it 'does not mute notifications' do - expect(me.muting_notifications?(you)).to be false - end - end - - context 'with the notifications option set to true' do - before do - me.mute!(you, notifications: true) - end - - it 'does mute notifications' do - expect(me.muting_notifications?(you)).to be true - end - end - end - - describe 'ignoring reblogs from an account' do - before do - @me = Fabricate(:account, username: 'Me') - @you = Fabricate(:account, username: 'You') - end - - context 'with the reblogs option unspecified' do - before do - @me.follow!(@you) - end - - it 'defaults to showing reblogs' do - expect(@me.muting_reblogs?(@you)).to be(false) - end - end - - context 'with the reblogs option set to false' do - before do - @me.follow!(@you, reblogs: false) - end - - it 'does mute reblogs' do - expect(@me.muting_reblogs?(@you)).to be(true) - end - end - - context 'with the reblogs option set to true' do - before do - @me.follow!(@you, reblogs: true) - end - - it 'does not mute reblogs' do - expect(@me.muting_reblogs?(@you)).to be(false) - end - end - end -end diff --git a/spec/models/concerns/remotable_spec.rb b/spec/models/concerns/remotable_spec.rb deleted file mode 100644 index a4289cc4..00000000 --- a/spec/models/concerns/remotable_spec.rb +++ /dev/null @@ -1,219 +0,0 @@ -# frozen_string_literal: true - -require 'rails_helper' - -RSpec.describe Remotable do - class Foo - def initialize - @attrs = {} - end - - def [](arg) - @attrs[arg] - end - - def []=(arg1, arg2) - @attrs[arg1] = arg2 - end - - def hoge=(arg); end - - def hoge_file_name=(arg); end - - def has_attribute?(arg); end - - def self.attachment_definitions - { hoge: nil } - end - end - - context 'Remotable module is included' do - before do - class Foo - include Remotable - remotable_attachment :hoge, 1.kilobyte - end - end - - let(:attribute_name) { "#{hoge}_remote_url".to_sym } - let(:code) { 200 } - let(:file) { 'filename="foo.txt"' } - let(:foo) { Foo.new } - let(:headers) { { 'content-disposition' => file } } - let(:hoge) { :hoge } - let(:url) { 'https://google.com' } - - let(:request) do - stub_request(:get, url) - .to_return(status: code, headers: headers) - end - - it 'defines a method #hoge_remote_url=' do - expect(foo).to respond_to(:hoge_remote_url=) - end - - it 'defines a method #reset_hoge!' do - expect(foo).to respond_to(:reset_hoge!) - end - - describe '#hoge_remote_url' do - before do - request - end - - it 'always returns arg' do - [nil, '', [], {}].each do |arg| - expect(foo.hoge_remote_url = arg).to be arg - end - end - - context 'Addressable::URI::InvalidURIError raised' do - it 'makes no request' do - allow(Addressable::URI).to receive_message_chain(:parse, :normalize) - .with(url).with(no_args).and_raise(Addressable::URI::InvalidURIError) - - foo.hoge_remote_url = url - expect(request).not_to have_been_requested - end - end - - context 'scheme is neither http nor https' do - let(:url) { 'ftp://google.com' } - - it 'makes no request' do - foo.hoge_remote_url = url - expect(request).not_to have_been_requested - end - end - - context 'parsed_url.host is empty' do - it 'makes no request' do - parsed_url = double(scheme: 'https', host: double(blank?: true)) - allow(Addressable::URI).to receive_message_chain(:parse, :normalize) - .with(url).with(no_args).and_return(parsed_url) - - foo.hoge_remote_url = url - expect(request).not_to have_been_requested - end - end - - context 'parsed_url.host is nil' do - it 'makes no request' do - parsed_url = Addressable::URI.parse('https:https://example.com/path/file.png') - allow(Addressable::URI).to receive_message_chain(:parse, :normalize) - .with(url).with(no_args).and_return(parsed_url) - - foo.hoge_remote_url = url - expect(request).not_to have_been_requested - end - end - - context 'foo[attribute_name] == url' do - it 'makes no request' do - allow(foo).to receive(:[]).with(attribute_name).and_return(url) - - foo.hoge_remote_url = url - expect(request).not_to have_been_requested - end - end - - context "scheme is https, parsed_url.host isn't empty, and foo[attribute_name] != url" do - it 'makes a request' do - foo.hoge_remote_url = url - expect(request).to have_been_requested - end - - context 'response.code != 200' do - let(:code) { 500 } - - it 'calls not send' do - expect(foo).not_to receive(:send).with("#{hoge}=", any_args) - expect(foo).not_to receive(:send).with("#{hoge}_file_name=", any_args) - foo.hoge_remote_url = url - end - end - - context 'response.code == 200' do - let(:code) { 200 } - - context 'response contains headers["content-disposition"]' do - let(:file) { 'filename="foo.txt"' } - let(:headers) { { 'content-disposition' => file } } - - it 'calls send' do - string_io = StringIO.new('') - extname = '.txt' - basename = '0123456789abcdef' - - allow(SecureRandom).to receive(:hex).and_return(basename) - allow(StringIO).to receive(:new).with(anything).and_return(string_io) - - expect(foo).to receive(:send).with("#{hoge}=", string_io) - expect(foo).to receive(:send).with("#{hoge}_file_name=", basename + extname) - foo.hoge_remote_url = url - end - end - - context 'if has_attribute?' do - it 'calls foo[attribute_name] = url' do - allow(foo).to receive(:has_attribute?).with(attribute_name).and_return(true) - expect(foo).to receive('[]=').with(attribute_name, url) - foo.hoge_remote_url = url - end - end - - context 'unless has_attribute?' do - it 'calls not foo[attribute_name] = url' do - allow(foo).to receive(:has_attribute?) - .with(attribute_name).and_return(false) - expect(foo).not_to receive('[]=').with(attribute_name, url) - foo.hoge_remote_url = url - end - end - end - - context 'an error raised during the request' do - let(:request) { stub_request(:get, url).to_raise(error_class) } - - error_classes = [ - HTTP::TimeoutError, - HTTP::ConnectionError, - OpenSSL::SSL::SSLError, - Paperclip::Errors::NotIdentifiedByImageMagickError, - Addressable::URI::InvalidURIError, - ] - - error_classes.each do |error_class| - let(:error_class) { error_class } - - it 'calls Rails.logger.debug' do - expect(Rails.logger).to receive(:debug).with(/^Error fetching remote #{hoge}: /) - foo.hoge_remote_url = url - end - end - end - end - end - - describe '#reset_hoge!' do - context 'if url.blank?' do - it 'returns nil, without clearing foo[attribute_name] and calling #hoge_remote_url=' do - url = nil - expect(foo).not_to receive(:send).with(:hoge_remote_url=, url) - foo[attribute_name] = url - expect(foo.reset_hoge!).to be_nil - expect(foo[attribute_name]).to be_nil - end - end - - context 'unless url.blank?' do - it 'clears foo[attribute_name] and calls #hoge_remote_url=' do - foo[attribute_name] = url - expect(foo).to receive(:send).with(:hoge_remote_url=, url) - foo.reset_hoge! - expect(foo[attribute_name]).to be '' - end - end - end - end -end diff --git a/spec/models/concerns/status_threading_concern_spec.rb b/spec/models/concerns/status_threading_concern_spec.rb deleted file mode 100644 index 50286ef7..00000000 --- a/spec/models/concerns/status_threading_concern_spec.rb +++ /dev/null @@ -1,132 +0,0 @@ -# frozen_string_literal: true - -require 'rails_helper' - -describe StatusThreadingConcern do - describe '#ancestors' do - let!(:alice) { Fabricate(:account, username: 'alice') } - let!(:bob) { Fabricate(:account, username: 'bob', domain: 'example.com') } - let!(:jeff) { Fabricate(:account, username: 'jeff') } - let!(:status) { Fabricate(:status, account: alice) } - let!(:reply1) { Fabricate(:status, thread: status, account: jeff) } - let!(:reply2) { Fabricate(:status, thread: reply1, account: bob) } - let!(:reply3) { Fabricate(:status, thread: reply2, account: alice) } - let!(:viewer) { Fabricate(:account, username: 'viewer') } - - it 'returns conversation history' do - expect(reply3.ancestors(4)).to include(status, reply1, reply2) - end - - it 'does not return conversation history user is not allowed to see' do - reply1.update(visibility: :private) - status.update(visibility: :direct) - - expect(reply3.ancestors(4, viewer)).to_not include(reply1, status) - end - - it 'does not return conversation history from blocked users' do - viewer.block!(jeff) - expect(reply3.ancestors(4, viewer)).to_not include(reply1) - end - - it 'does not return conversation history from muted users' do - viewer.mute!(jeff) - expect(reply3.ancestors(4, viewer)).to_not include(reply1) - end - - it 'does not return conversation history from silenced and not followed users' do - jeff.silence! - expect(reply3.ancestors(4, viewer)).to_not include(reply1) - end - - it 'does not return conversation history from blocked domains' do - viewer.block_domain!('example.com') - expect(reply3.ancestors(4, viewer)).to_not include(reply2) - end - - it 'ignores deleted records' do - first_status = Fabricate(:status, account: bob) - second_status = Fabricate(:status, thread: first_status, account: alice) - - # Create cache and delete cached record - second_status.ancestors(4) - first_status.destroy - - expect(second_status.ancestors(4)).to eq([]) - end - - it 'can return more records than previously requested' do - first_status = Fabricate(:status, account: bob) - second_status = Fabricate(:status, thread: first_status, account: alice) - third_status = Fabricate(:status, thread: second_status, account: alice) - - # Create cache - second_status.ancestors(1) - - expect(third_status.ancestors(2)).to eq([first_status, second_status]) - end - - it 'can return fewer records than previously requested' do - first_status = Fabricate(:status, account: bob) - second_status = Fabricate(:status, thread: first_status, account: alice) - third_status = Fabricate(:status, thread: second_status, account: alice) - - # Create cache - second_status.ancestors(2) - - expect(third_status.ancestors(1)).to eq([second_status]) - end - end - - describe '#descendants' do - let!(:alice) { Fabricate(:account, username: 'alice') } - let!(:bob) { Fabricate(:account, username: 'bob', domain: 'example.com') } - let!(:jeff) { Fabricate(:account, username: 'jeff') } - let!(:status) { Fabricate(:status, account: alice) } - let!(:reply1) { Fabricate(:status, thread: status, account: alice) } - let!(:reply2) { Fabricate(:status, thread: status, account: bob) } - let!(:reply3) { Fabricate(:status, thread: reply1, account: jeff) } - let!(:viewer) { Fabricate(:account, username: 'viewer') } - - it 'returns replies' do - expect(status.descendants(4)).to include(reply1, reply2, reply3) - end - - it 'does not return replies user is not allowed to see' do - reply1.update(visibility: :private) - reply3.update(visibility: :direct) - - expect(status.descendants(4, viewer)).to_not include(reply1, reply3) - end - - it 'does not return replies from blocked users' do - viewer.block!(jeff) - expect(status.descendants(4, viewer)).to_not include(reply3) - end - - it 'does not return replies from muted users' do - viewer.mute!(jeff) - expect(status.descendants(4, viewer)).to_not include(reply3) - end - - it 'does not return replies from silenced and not followed users' do - jeff.silence! - expect(status.descendants(4, viewer)).to_not include(reply3) - end - - it 'does not return replies from blocked domains' do - viewer.block_domain!('example.com') - expect(status.descendants(4, viewer)).to_not include(reply2) - end - - it 'promotes self-replies to the top while leaving the rest in order' do - a = Fabricate(:status, account: alice) - d = Fabricate(:status, account: jeff, thread: a) - e = Fabricate(:status, account: bob, thread: d) - c = Fabricate(:status, account: alice, thread: a) - f = Fabricate(:status, account: bob, thread: c) - - expect(a.descendants(20)).to eq [c, d, e, f] - end - end -end diff --git a/spec/models/concerns/streamable_spec.rb b/spec/models/concerns/streamable_spec.rb deleted file mode 100644 index b5f2d519..00000000 --- a/spec/models/concerns/streamable_spec.rb +++ /dev/null @@ -1,63 +0,0 @@ -# frozen_string_literal: true - -require 'rails_helper' - -RSpec.describe Streamable do - class Parent - def title; end - - def target; end - - def thread; end - - def self.has_one(*); end - - def self.after_create; end - end - - class Child < Parent - include Streamable - end - - child = Child.new - - describe '#title' do - it 'calls Parent#title' do - expect_any_instance_of(Parent).to receive(:title) - child.title - end - end - - describe '#content' do - it 'calls #title' do - expect_any_instance_of(Parent).to receive(:title) - child.content - end - end - - describe '#target' do - it 'calls Parent#target' do - expect_any_instance_of(Parent).to receive(:target) - child.target - end - end - - describe '#object_type' do - it 'returns :activity' do - expect(child.object_type).to eq :activity - end - end - - describe '#thread' do - it 'calls Parent#thread' do - expect_any_instance_of(Parent).to receive(:thread) - child.thread - end - end - - describe '#hidden?' do - it 'returns false' do - expect(child.hidden?).to be false - end - end -end diff --git a/spec/models/conversation_mute_spec.rb b/spec/models/conversation_mute_spec.rb deleted file mode 100644 index 3fc2915d..00000000 --- a/spec/models/conversation_mute_spec.rb +++ /dev/null @@ -1,4 +0,0 @@ -require 'rails_helper' - -RSpec.describe ConversationMute, type: :model do -end diff --git a/spec/models/conversation_spec.rb b/spec/models/conversation_spec.rb deleted file mode 100644 index 8b5e4fda..00000000 --- a/spec/models/conversation_spec.rb +++ /dev/null @@ -1,13 +0,0 @@ -require 'rails_helper' - -RSpec.describe Conversation, type: :model do - describe '#local?' do - it 'returns true when URI is nil' do - expect(Fabricate(:conversation).local?).to be true - end - - it 'returns false when URI is not nil' do - expect(Fabricate(:conversation, uri: 'abc').local?).to be false - end - end -end diff --git a/spec/models/custom_emoji_filter_spec.rb b/spec/models/custom_emoji_filter_spec.rb deleted file mode 100644 index d859f5c5..00000000 --- a/spec/models/custom_emoji_filter_spec.rb +++ /dev/null @@ -1,70 +0,0 @@ -# frozen_string_literal: true - -require 'rails_helper' - -RSpec.describe CustomEmojiFilter do - describe '#results' do - let!(:custom_emoji_0) { Fabricate(:custom_emoji, domain: 'a') } - let!(:custom_emoji_1) { Fabricate(:custom_emoji, domain: 'b') } - let!(:custom_emoji_2) { Fabricate(:custom_emoji, domain: nil, shortcode: 'hoge') } - - subject { described_class.new(params).results } - - context 'params have values' do - context 'local' do - let(:params) { { local: true } } - - it 'returns ActiveRecord::Relation' do - expect(subject).to be_kind_of(ActiveRecord::Relation) - expect(subject).to match_array([custom_emoji_2]) - end - end - - context 'remote' do - let(:params) { { remote: true } } - - it 'returns ActiveRecord::Relation' do - expect(subject).to be_kind_of(ActiveRecord::Relation) - expect(subject).to match_array([custom_emoji_0, custom_emoji_1]) - end - end - - context 'by_domain' do - let(:params) { { by_domain: 'a' } } - - it 'returns ActiveRecord::Relation' do - expect(subject).to be_kind_of(ActiveRecord::Relation) - expect(subject).to match_array([custom_emoji_0]) - end - end - - context 'shortcode' do - let(:params) { { shortcode: 'hoge' } } - - it 'returns ActiveRecord::Relation' do - expect(subject).to be_kind_of(ActiveRecord::Relation) - expect(subject).to match_array([custom_emoji_2]) - end - end - - context 'else' do - let(:params) { { else: 'else' } } - - it 'raises RuntimeError' do - expect do - subject - end.to raise_error(RuntimeError, /Unknown filter: else/) - end - end - end - - context 'params without value' do - let(:params) { { hoge: nil } } - - it 'returns ActiveRecord::Relation' do - expect(subject).to be_kind_of(ActiveRecord::Relation) - expect(subject).to match_array([custom_emoji_0, custom_emoji_1, custom_emoji_2]) - end - end - end -end diff --git a/spec/models/custom_emoji_spec.rb b/spec/models/custom_emoji_spec.rb deleted file mode 100644 index 488fa027..00000000 --- a/spec/models/custom_emoji_spec.rb +++ /dev/null @@ -1,87 +0,0 @@ -require 'rails_helper' - -RSpec.describe CustomEmoji, type: :model do - describe '#search' do - let(:custom_emoji) { Fabricate(:custom_emoji, shortcode: shortcode) } - - subject { described_class.search(search_term) } - - context 'shortcode is exact' do - let(:shortcode) { 'blobpats' } - let(:search_term) { 'blobpats' } - - it 'finds emoji' do - is_expected.to include(custom_emoji) - end - end - - context 'shortcode is partial' do - let(:shortcode) { 'blobpats' } - let(:search_term) { 'blob' } - - it 'finds emoji' do - is_expected.to include(custom_emoji) - end - end - end - - describe '#local?' do - let(:custom_emoji) { Fabricate(:custom_emoji, domain: domain) } - - subject { custom_emoji.local? } - - context 'domain is nil' do - let(:domain) { nil } - - it 'returns true' do - is_expected.to be true - end - end - - context 'domain is present' do - let(:domain) { 'example.com' } - - it 'returns false' do - is_expected.to be false - end - end - end - - describe '#object_type' do - it 'returns :emoji' do - custom_emoji = Fabricate(:custom_emoji) - expect(custom_emoji.object_type).to be :emoji - end - end - - describe '.from_text' do - let!(:emojo) { Fabricate(:custom_emoji) } - - subject { described_class.from_text(text, nil) } - - context 'with plain text' do - let(:text) { 'Hello :coolcat:' } - - it 'returns records used via shortcodes in text' do - is_expected.to include(emojo) - end - end - - context 'with html' do - let(:text) { 'Hello :coolcat:
' } - - it 'returns records used via shortcodes in text' do - is_expected.to include(emojo) - end - end - end - - describe 'pre_validation' do - let(:custom_emoji) { Fabricate(:custom_emoji, domain: 'wWw.GaB.cOm') } - - it 'should downcase' do - custom_emoji.valid? - expect(custom_emoji.domain).to eq('www.gab.com') - end - end -end diff --git a/spec/models/custom_filter_spec.rb b/spec/models/custom_filter_spec.rb deleted file mode 100644 index 3943dd5f..00000000 --- a/spec/models/custom_filter_spec.rb +++ /dev/null @@ -1,4 +0,0 @@ -require 'rails_helper' - -RSpec.describe CustomFilter, type: :model do -end diff --git a/spec/models/domain_block_spec.rb b/spec/models/domain_block_spec.rb deleted file mode 100644 index 0035fd0f..00000000 --- a/spec/models/domain_block_spec.rb +++ /dev/null @@ -1,70 +0,0 @@ -require 'rails_helper' - -RSpec.describe DomainBlock, type: :model do - describe 'validations' do - it 'has a valid fabricator' do - domain_block = Fabricate.build(:domain_block) - expect(domain_block).to be_valid - end - - it 'is invalid without a domain' do - domain_block = Fabricate.build(:domain_block, domain: nil) - domain_block.valid? - expect(domain_block).to model_have_error_on_field(:domain) - end - - it 'is invalid if the same normalized domain already exists' do - domain_block_1 = Fabricate(:domain_block, domain: 'ã«ã‚ƒã‚“') - domain_block_2 = Fabricate.build(:domain_block, domain: 'xn--r9j5b5b') - domain_block_2.valid? - expect(domain_block_2).to model_have_error_on_field(:domain) - end - end - - describe 'blocked?' do - it 'returns true if the domain is suspended' do - Fabricate(:domain_block, domain: 'domain', severity: :suspend) - expect(DomainBlock.blocked?('domain')).to eq true - end - - it 'returns false even if the domain is silenced' do - Fabricate(:domain_block, domain: 'domain', severity: :silence) - expect(DomainBlock.blocked?('domain')).to eq false - end - - it 'returns false if the domain is not suspended nor silenced' do - expect(DomainBlock.blocked?('domain')).to eq false - end - end - - describe 'stricter_than?' do - it 'returns true if the new block has suspend severity while the old has lower severity' do - suspend = DomainBlock.new(domain: 'domain', severity: :suspend) - silence = DomainBlock.new(domain: 'domain', severity: :silence) - noop = DomainBlock.new(domain: 'domain', severity: :noop) - expect(suspend.stricter_than?(silence)).to be true - expect(suspend.stricter_than?(noop)).to be true - end - - it 'returns false if the new block has lower severity than the old one' do - suspend = DomainBlock.new(domain: 'domain', severity: :suspend) - silence = DomainBlock.new(domain: 'domain', severity: :silence) - noop = DomainBlock.new(domain: 'domain', severity: :noop) - expect(silence.stricter_than?(suspend)).to be false - expect(noop.stricter_than?(suspend)).to be false - expect(noop.stricter_than?(silence)).to be false - end - - it 'returns false if the new block does is less strict regarding reports' do - older = DomainBlock.new(domain: 'domain', severity: :silence, reject_reports: true) - newer = DomainBlock.new(domain: 'domain', severity: :silence, reject_reports: false) - expect(newer.stricter_than?(older)).to be false - end - - it 'returns false if the new block does is less strict regarding media' do - older = DomainBlock.new(domain: 'domain', severity: :silence, reject_media: true) - newer = DomainBlock.new(domain: 'domain', severity: :silence, reject_media: false) - expect(newer.stricter_than?(older)).to be false - end - end -end diff --git a/spec/models/email_domain_block_spec.rb b/spec/models/email_domain_block_spec.rb deleted file mode 100644 index efd2853a..00000000 --- a/spec/models/email_domain_block_spec.rb +++ /dev/null @@ -1,22 +0,0 @@ -require 'rails_helper' - -RSpec.describe EmailDomainBlock, type: :model do - describe 'validations' do - it 'has a valid fabricator' do - email_domain_block = Fabricate.build(:email_domain_block) - expect(email_domain_block).to be_valid - end - end - - describe 'block?' do - it 'returns true if the domain is registed' do - Fabricate(:email_domain_block, domain: 'example.com') - expect(EmailDomainBlock.block?('nyarn@example.com')).to eq true - end - - it 'returns true if the domain is not registed' do - Fabricate(:email_domain_block, domain: 'example.com') - expect(EmailDomainBlock.block?('nyarn@example.net')).to eq false - end - end -end diff --git a/spec/models/export_spec.rb b/spec/models/export_spec.rb deleted file mode 100644 index e31deef4..00000000 --- a/spec/models/export_spec.rb +++ /dev/null @@ -1,66 +0,0 @@ -require 'rails_helper' - -describe Export do - let(:account) { Fabricate(:account) } - let(:target_accounts) do - [ {}, { username: 'one', domain: 'local.host' } ].map(&method(:Fabricate).curry(2).call(:account)) - end - - describe 'to_csv' do - it 'returns a csv of the blocked accounts' do - target_accounts.each(&account.method(:block!)) - - export = Export.new(account).to_blocked_accounts_csv - results = export.strip.split - - expect(results.size).to eq 2 - expect(results.first).to eq 'one@local.host' - end - - it 'returns a csv of the muted accounts' do - target_accounts.each(&account.method(:mute!)) - - export = Export.new(account).to_muted_accounts_csv - results = export.strip.split("\n") - - expect(results.size).to eq 3 - expect(results.first).to eq 'Account address,Hide notifications' - expect(results.second).to eq 'one@local.host,true' - end - - it 'returns a csv of the following accounts' do - target_accounts.each(&account.method(:follow!)) - - export = Export.new(account).to_following_accounts_csv - results = export.strip.split("\n") - - expect(results.size).to eq 3 - expect(results.first).to eq 'Account address,Show reposts' - expect(results.second).to eq 'one@local.host,true' - end - end - - describe 'total_storage' do - it 'returns the total size of the media attachments' do - media_attachment = Fabricate(:media_attachment, account: account) - expect(Export.new(account).total_storage).to eq media_attachment.file_file_size || 0 - end - end - - describe 'total_follows' do - it 'returns the total number of the followed accounts' do - target_accounts.each(&account.method(:follow!)) - expect(Export.new(account.reload).total_follows).to eq 2 - end - - it 'returns the total number of the blocked accounts' do - target_accounts.each(&account.method(:block!)) - expect(Export.new(account.reload).total_blocks).to eq 2 - end - - it 'returns the total number of the muted accounts' do - target_accounts.each(&account.method(:mute!)) - expect(Export.new(account.reload).total_mutes).to eq 2 - end - end -end diff --git a/spec/models/favourite_spec.rb b/spec/models/favourite_spec.rb deleted file mode 100644 index ba1410a4..00000000 --- a/spec/models/favourite_spec.rb +++ /dev/null @@ -1,29 +0,0 @@ -require 'rails_helper' - -RSpec.describe Favourite, type: :model do - let(:account) { Fabricate(:account) } - - context 'when status is a reblog' do - let(:reblog) { Fabricate(:status, reblog: nil) } - let(:status) { Fabricate(:status, reblog: reblog) } - - it 'invalidates if the reblogged status is already a favourite' do - Favourite.create!(account: account, status: reblog) - expect(Favourite.new(account: account, status: status).valid?).to eq false - end - - it 'replaces status with the reblogged one if it is a reblog' do - favourite = Favourite.create!(account: account, status: status) - expect(favourite.status).to eq reblog - end - end - - context 'when status is not a reblog' do - let(:status) { Fabricate(:status, reblog: nil) } - - it 'saves with the specified status' do - favourite = Favourite.create!(account: account, status: status) - expect(favourite.status).to eq status - end - end -end diff --git a/spec/models/featured_tag_spec.rb b/spec/models/featured_tag_spec.rb deleted file mode 100644 index 07533e0b..00000000 --- a/spec/models/featured_tag_spec.rb +++ /dev/null @@ -1,4 +0,0 @@ -require 'rails_helper' - -RSpec.describe FeaturedTag, type: :model do -end diff --git a/spec/models/follow_request_spec.rb b/spec/models/follow_request_spec.rb deleted file mode 100644 index 2cf28b26..00000000 --- a/spec/models/follow_request_spec.rb +++ /dev/null @@ -1,30 +0,0 @@ -require 'rails_helper' - -RSpec.describe FollowRequest, type: :model do - describe '#authorize!' do - let(:follow_request) { Fabricate(:follow_request, account: account, target_account: target_account) } - let(:account) { Fabricate(:account) } - let(:target_account) { Fabricate(:account) } - - it 'calls Account#follow!, MergeWorker.perform_async, and #destroy!' do - expect(account).to receive(:follow!).with(target_account, reblogs: true, uri: follow_request.uri) - expect(MergeWorker).to receive(:perform_async).with(target_account.id, account.id) - expect(follow_request).to receive(:destroy!) - follow_request.authorize! - end - - it 'correctly passes show_reblogs when true' do - follow_request = Fabricate.create(:follow_request, show_reblogs: true) - follow_request.authorize! - target = follow_request.target_account - expect(follow_request.account.muting_reblogs?(target)).to be false - end - - it 'correctly passes show_reblogs when false' do - follow_request = Fabricate.create(:follow_request, show_reblogs: false) - follow_request.authorize! - target = follow_request.target_account - expect(follow_request.account.muting_reblogs?(target)).to be true - end - end -end diff --git a/spec/models/follow_spec.rb b/spec/models/follow_spec.rb deleted file mode 100644 index 0c84e5e7..00000000 --- a/spec/models/follow_spec.rb +++ /dev/null @@ -1,70 +0,0 @@ -require 'rails_helper' - -RSpec.describe Follow, type: :model do - let(:alice) { Fabricate(:account, username: 'alice') } - let(:bob) { Fabricate(:account, username: 'bob') } - - describe 'validations' do - subject { Follow.new(account: alice, target_account: bob) } - - it 'has a valid fabricator' do - follow = Fabricate.build(:follow) - expect(follow).to be_valid - end - - it 'is invalid without an account' do - follow = Fabricate.build(:follow, account: nil) - follow.valid? - expect(follow).to model_have_error_on_field(:account) - end - - it 'is invalid without a target_account' do - follow = Fabricate.build(:follow, target_account: nil) - follow.valid? - expect(follow).to model_have_error_on_field(:target_account) - end - - it 'is invalid if account already follows too many people' do - alice.update(following_count: FollowLimitValidator::LIMIT) - - expect(subject).to_not be_valid - expect(subject).to model_have_error_on_field(:base) - end - - it 'is valid if account is only on the brink of following too many people' do - alice.update(following_count: FollowLimitValidator::LIMIT - 1) - - expect(subject).to be_valid - expect(subject).to_not model_have_error_on_field(:base) - end - end - - describe 'recent' do - it 'sorts so that more recent follows comes earlier' do - follow0 = Follow.create!(account: alice, target_account: bob) - follow1 = Follow.create!(account: bob, target_account: alice) - - a = Follow.recent.to_a - - expect(a.size).to eq 2 - expect(a[0]).to eq follow1 - expect(a[1]).to eq follow0 - end - end - - describe 'revoke_request!' do - let(:follow) { Fabricate(:follow, account: account, target_account: target_account) } - let(:account) { Fabricate(:account) } - let(:target_account) { Fabricate(:account) } - - it 'revokes the follow relation' do - follow.revoke_request! - expect(account.following?(target_account)).to be false - end - - it 'creates a follow request' do - follow.revoke_request! - expect(account.requested?(target_account)).to be true - end - end -end diff --git a/spec/models/form/status_batch_spec.rb b/spec/models/form/status_batch_spec.rb deleted file mode 100644 index 00c790a1..00000000 --- a/spec/models/form/status_batch_spec.rb +++ /dev/null @@ -1,52 +0,0 @@ -require 'rails_helper' - -describe Form::StatusBatch do - let(:form) { Form::StatusBatch.new(action: action, status_ids: status_ids) } - let(:status) { Fabricate(:status) } - - describe 'with nsfw action' do - let(:status_ids) { [status.id, nonsensitive_status.id, sensitive_status.id] } - let(:nonsensitive_status) { Fabricate(:status, sensitive: false) } - let(:sensitive_status) { Fabricate(:status, sensitive: true) } - let!(:shown_media_attachment) { Fabricate(:media_attachment, status: nonsensitive_status) } - let!(:hidden_media_attachment) { Fabricate(:media_attachment, status: sensitive_status) } - - context 'nsfw_on' do - let(:action) { 'nsfw_on' } - - it { expect(form.save).to be true } - it { expect { form.save }.to change { nonsensitive_status.reload.sensitive }.from(false).to(true) } - it { expect { form.save }.not_to change { sensitive_status.reload.sensitive } } - it { expect { form.save }.not_to change { status.reload.sensitive } } - end - - context 'nsfw_off' do - let(:action) { 'nsfw_off' } - - it { expect(form.save).to be true } - it { expect { form.save }.to change { sensitive_status.reload.sensitive }.from(true).to(false) } - it { expect { form.save }.not_to change { nonsensitive_status.reload.sensitive } } - it { expect { form.save }.not_to change { status.reload.sensitive } } - end - end - - describe 'with delete action' do - let(:status_ids) { [status.id] } - let(:action) { 'delete' } - let!(:another_status) { Fabricate(:status) } - - before do - allow(RemovalWorker).to receive(:perform_async) - end - - it 'call RemovalWorker' do - form.save - expect(RemovalWorker).to have_received(:perform_async).with(status.id) - end - - it 'do not call RemovalWorker' do - form.save - expect(RemovalWorker).not_to have_received(:perform_async).with(another_status.id) - end - end -end diff --git a/spec/models/group_removed_account_spec.rb b/spec/models/group_removed_account_spec.rb deleted file mode 100644 index 098f7c18..00000000 --- a/spec/models/group_removed_account_spec.rb +++ /dev/null @@ -1,5 +0,0 @@ -require 'rails_helper' - -RSpec.describe GroupRemovedAccount, type: :model do - pending "add some examples to (or delete) #{__FILE__}" -end diff --git a/spec/models/home_feed_spec.rb b/spec/models/home_feed_spec.rb deleted file mode 100644 index 3acb997f..00000000 --- a/spec/models/home_feed_spec.rb +++ /dev/null @@ -1,45 +0,0 @@ -require 'rails_helper' - -RSpec.describe HomeFeed, type: :model do - let(:account) { Fabricate(:account) } - - subject { described_class.new(account) } - - describe '#get' do - before do - Fabricate(:status, account: account, id: 1) - Fabricate(:status, account: account, id: 2) - Fabricate(:status, account: account, id: 3) - Fabricate(:status, account: account, id: 10) - end - - context 'when feed is generated' do - before do - Redis.current.zadd( - FeedManager.instance.key(:home, account.id), - [[4, 4], [3, 3], [2, 2], [1, 1]] - ) - end - - it 'gets statuses with ids in the range from redis' do - results = subject.get(3) - - expect(results.map(&:id)).to eq [3, 2] - expect(results.first.attributes.keys).to eq %w(id updated_at) - end - end - - context 'when feed is being generated' do - before do - Redis.current.set("account:#{account.id}:regeneration", true) - end - - it 'gets statuses with ids in the range from database' do - results = subject.get(3) - - expect(results.map(&:id)).to eq [10, 3, 2] - expect(results.first.attributes.keys).to include('id', 'updated_at') - end - end - end -end diff --git a/spec/models/identity_spec.rb b/spec/models/identity_spec.rb deleted file mode 100644 index 689c9b79..00000000 --- a/spec/models/identity_spec.rb +++ /dev/null @@ -1,16 +0,0 @@ -require 'rails_helper' - -RSpec.describe Identity, type: :model do - describe '.find_for_oauth' do - let(:auth) { Fabricate(:identity, user: Fabricate(:user)) } - - it 'calls .find_or_create_by' do - expect(described_class).to receive(:find_or_create_by).with(uid: auth.uid, provider: auth.provider) - described_class.find_for_oauth(auth) - end - - it 'returns an instance of Identity' do - expect(described_class.find_for_oauth(auth)).to be_instance_of Identity - end - end -end diff --git a/spec/models/import_spec.rb b/spec/models/import_spec.rb deleted file mode 100644 index 32176116..00000000 --- a/spec/models/import_spec.rb +++ /dev/null @@ -1,24 +0,0 @@ -require 'rails_helper' - -RSpec.describe Import, type: :model do - let (:account) { Fabricate(:account) } - let (:type) { 'following' } - let (:data) { attachment_fixture('imports.txt') } - - describe 'validations' do - it 'has a valid parameters' do - import = Import.create(account: account, type: type, data: data) - expect(import).to be_valid - end - - it 'is invalid without an type' do - import = Import.create(account: account, data: data) - expect(import).to model_have_error_on_field(:type) - end - - it 'is invalid without a data' do - import = Import.create(account: account, type: type) - expect(import).to model_have_error_on_field(:data) - end - end -end diff --git a/spec/models/invite_spec.rb b/spec/models/invite_spec.rb deleted file mode 100644 index 0ba1dccb..00000000 --- a/spec/models/invite_spec.rb +++ /dev/null @@ -1,30 +0,0 @@ -require 'rails_helper' - -RSpec.describe Invite, type: :model do - describe '#valid_for_use?' do - it 'returns true when there are no limitations' do - invite = Invite.new(max_uses: nil, expires_at: nil) - expect(invite.valid_for_use?).to be true - end - - it 'returns true when not expired' do - invite = Invite.new(max_uses: nil, expires_at: 1.hour.from_now) - expect(invite.valid_for_use?).to be true - end - - it 'returns false when expired' do - invite = Invite.new(max_uses: nil, expires_at: 1.hour.ago) - expect(invite.valid_for_use?).to be false - end - - it 'returns true when uses still available' do - invite = Invite.new(max_uses: 250, uses: 249, expires_at: nil) - expect(invite.valid_for_use?).to be true - end - - it 'returns false when maximum uses reached' do - invite = Invite.new(max_uses: 250, uses: 250, expires_at: nil) - expect(invite.valid_for_use?).to be false - end - end -end diff --git a/spec/models/list_account_spec.rb b/spec/models/list_account_spec.rb deleted file mode 100644 index a0cf02ef..00000000 --- a/spec/models/list_account_spec.rb +++ /dev/null @@ -1,4 +0,0 @@ -require 'rails_helper' - -RSpec.describe ListAccount, type: :model do -end diff --git a/spec/models/list_spec.rb b/spec/models/list_spec.rb deleted file mode 100644 index b780bb1d..00000000 --- a/spec/models/list_spec.rb +++ /dev/null @@ -1,4 +0,0 @@ -require 'rails_helper' - -RSpec.describe List, type: :model do -end diff --git a/spec/models/media_attachment_spec.rb b/spec/models/media_attachment_spec.rb deleted file mode 100644 index 266cd492..00000000 --- a/spec/models/media_attachment_spec.rb +++ /dev/null @@ -1,145 +0,0 @@ -require 'rails_helper' - -RSpec.describe MediaAttachment, type: :model do - describe 'local?' do - let(:media_attachment) { Fabricate(:media_attachment, remote_url: remote_url) } - - subject { media_attachment.local? } - - context 'remote_url is blank' do - let(:remote_url) { '' } - - it 'returns true' do - is_expected.to be true - end - end - - context 'remote_url is present' do - let(:remote_url) { 'remote_url' } - - it 'returns false' do - is_expected.to be false - end - end - end - - describe 'needs_redownload?' do - let(:media_attachment) { Fabricate(:media_attachment, remote_url: remote_url, file: file) } - - subject { media_attachment.needs_redownload? } - - context 'file is blank' do - let(:file) { nil } - - context 'remote_url is blank' do - let(:remote_url) { '' } - - it 'returns false' do - is_expected.to be false - end - end - - context 'remote_url is present' do - let(:remote_url) { 'remote_url' } - - it 'returns true' do - is_expected.to be true - end - end - end - - context 'file is present' do - let(:file) { attachment_fixture('avatar.gif') } - - context 'remote_url is blank' do - let(:remote_url) { '' } - - it 'returns false' do - is_expected.to be false - end - end - - context 'remote_url is present' do - let(:remote_url) { 'remote_url' } - - it 'returns true' do - is_expected.to be false - end - end - end - end - - describe '#to_param' do - let(:media_attachment) { Fabricate(:media_attachment) } - let(:shortcode) { media_attachment.shortcode } - - it 'returns shortcode' do - expect(media_attachment.to_param).to eq shortcode - end - end - - describe 'animated gif conversion' do - let(:media) { MediaAttachment.create(account: Fabricate(:account), file: attachment_fixture('avatar.gif')) } - - it 'sets type to gifv' do - expect(media.type).to eq 'gifv' - end - - it 'converts original file to mp4' do - expect(media.file_content_type).to eq 'video/mp4' - end - - it 'sets meta' do - expect(media.file.meta["original"]["width"]).to eq 128 - expect(media.file.meta["original"]["height"]).to eq 128 - end - end - - describe 'non-animated gif non-conversion' do - fixtures = [ - { filename: 'attachment.gif', width: 600, height: 400, aspect: 1.5 }, - { filename: 'mini-static.gif', width: 32, height: 32, aspect: 1.0 }, - ] - - fixtures.each do |fixture| - context fixture[:filename] do - let(:media) { MediaAttachment.create(account: Fabricate(:account), file: attachment_fixture(fixture[:filename])) } - - it 'sets type to image' do - expect(media.type).to eq 'image' - end - - it 'leaves original file as-is' do - expect(media.file_content_type).to eq 'image/gif' - end - - it 'sets meta' do - expect(media.file.meta["original"]["width"]).to eq fixture[:width] - expect(media.file.meta["original"]["height"]).to eq fixture[:height] - expect(media.file.meta["original"]["aspect"]).to eq fixture[:aspect] - end - end - end - end - - describe 'jpeg' do - let(:media) { MediaAttachment.create(account: Fabricate(:account), file: attachment_fixture('attachment.jpg')) } - - it 'sets meta for different style' do - expect(media.file.meta["original"]["width"]).to eq 600 - expect(media.file.meta["original"]["height"]).to eq 400 - expect(media.file.meta["original"]["aspect"]).to eq 1.5 - expect(media.file.meta["small"]["width"]).to eq 490 - expect(media.file.meta["small"]["height"]).to eq 327 - expect(media.file.meta["small"]["aspect"]).to eq 490.0 / 327 - end - end - - describe 'descriptions for remote attachments' do - it 'are cut off at 140 characters' do - media = Fabricate(:media_attachment, description: 'foo' * 1000, remote_url: 'http://example.com/blah.jpg') - - expect(media.description.size).to be <= 420 - end - end -end diff --git a/spec/models/mention_spec.rb b/spec/models/mention_spec.rb deleted file mode 100644 index dbcf6a32..00000000 --- a/spec/models/mention_spec.rb +++ /dev/null @@ -1,22 +0,0 @@ -require 'rails_helper' - -RSpec.describe Mention, type: :model do - describe 'validations' do - it 'has a valid fabricator' do - mention = Fabricate.build(:mention) - expect(mention).to be_valid - end - - it 'is invalid without an account' do - mention = Fabricate.build(:mention, account: nil) - mention.valid? - expect(mention).to model_have_error_on_field(:account) - end - - it 'is invalid without a status' do - mention = Fabricate.build(:mention, status: nil) - mention.valid? - expect(mention).to model_have_error_on_field(:status) - end - end -end diff --git a/spec/models/mute_spec.rb b/spec/models/mute_spec.rb deleted file mode 100644 index 38a87bdf..00000000 --- a/spec/models/mute_spec.rb +++ /dev/null @@ -1,4 +0,0 @@ -require 'rails_helper' - -RSpec.describe Mute, type: :model do -end diff --git a/spec/models/notification_spec.rb b/spec/models/notification_spec.rb deleted file mode 100644 index 59c582cd..00000000 --- a/spec/models/notification_spec.rb +++ /dev/null @@ -1,129 +0,0 @@ -require 'rails_helper' - -RSpec.describe Notification, type: :model do - describe '#target_status' do - let(:notification) { Fabricate(:notification, activity: activity) } - let(:status) { Fabricate(:status) } - let(:reblog) { Fabricate(:status, reblog: status) } - let(:favourite) { Fabricate(:favourite, status: status) } - let(:mention) { Fabricate(:mention, status: status) } - - context 'activity is reblog' do - let(:activity) { reblog } - - it 'returns status' do - expect(notification.target_status).to eq status - end - end - - context 'activity is favourite' do - let(:type) { :favourite } - let(:activity) { favourite } - - it 'returns status' do - expect(notification.target_status).to eq status - end - end - - context 'activity is mention' do - let(:activity) { mention } - - it 'returns status' do - expect(notification.target_status).to eq status - end - end - end - - describe '#browserable?' do - let(:notification) { Fabricate(:notification) } - - subject { notification.browserable? } - - context 'type is :follow_request' do - before do - allow(notification).to receive(:type).and_return(:follow_request) - end - - it 'returns false' do - is_expected.to be false - end - end - - context 'type is not :follow_request' do - before do - allow(notification).to receive(:type).and_return(:else) - end - - it 'returns true' do - is_expected.to be true - end - end - end - - describe '#type' do - it 'returns :reblog for a Status' do - notification = Notification.new(activity: Status.new) - expect(notification.type).to eq :reblog - end - - it 'returns :mention for a Mention' do - notification = Notification.new(activity: Mention.new) - expect(notification.type).to eq :mention - end - - it 'returns :favourite for a Favourite' do - notification = Notification.new(activity: Favourite.new) - expect(notification.type).to eq :favourite - end - - it 'returns :follow for a Follow' do - notification = Notification.new(activity: Follow.new) - expect(notification.type).to eq :follow - end - end - - describe '.reload_stale_associations!' do - context 'account_ids are empty' do - let(:cached_items) { [] } - - subject { described_class.reload_stale_associations!(cached_items) } - - it 'returns nil' do - is_expected.to be nil - end - end - - context 'account_ids are present' do - before do - allow(accounts_with_ids).to receive(:[]).with(stale_account1.id).and_return(account1) - allow(accounts_with_ids).to receive(:[]).with(stale_account2.id).and_return(account2) - allow(Account).to receive_message_chain(:where, :includes, :each_with_object).and_return(accounts_with_ids) - end - - let(:cached_items) do - [ - Fabricate(:notification, activity: Fabricate(:status)), - Fabricate(:notification, activity: Fabricate(:follow)), - ] - end - - let(:stale_account1) { cached_items[0].from_account } - let(:stale_account2) { cached_items[1].from_account } - - let(:account1) { Fabricate(:account) } - let(:account2) { Fabricate(:account) } - - let(:accounts_with_ids) { { account1.id => account1, account2.id => account2 } } - - it 'reloads associations' do - expect(cached_items[0].from_account).to be stale_account1 - expect(cached_items[1].from_account).to be stale_account2 - - described_class.reload_stale_associations!(cached_items) - - expect(cached_items[0].from_account).to be account1 - expect(cached_items[1].from_account).to be account2 - end - end - end -end diff --git a/spec/models/poll_spec.rb b/spec/models/poll_spec.rb deleted file mode 100644 index 666f8ca6..00000000 --- a/spec/models/poll_spec.rb +++ /dev/null @@ -1,5 +0,0 @@ -require 'rails_helper' - -RSpec.describe Poll, type: :model do - pending "add some examples to (or delete) #{__FILE__}" -end diff --git a/spec/models/poll_vote_spec.rb b/spec/models/poll_vote_spec.rb deleted file mode 100644 index 354afd53..00000000 --- a/spec/models/poll_vote_spec.rb +++ /dev/null @@ -1,5 +0,0 @@ -require 'rails_helper' - -RSpec.describe PollVote, type: :model do - pending "add some examples to (or delete) #{__FILE__}" -end diff --git a/spec/models/preview_card_spec.rb b/spec/models/preview_card_spec.rb deleted file mode 100644 index 45233d1d..00000000 --- a/spec/models/preview_card_spec.rb +++ /dev/null @@ -1,4 +0,0 @@ -require 'rails_helper' - -RSpec.describe PreviewCard, type: :model do -end diff --git a/spec/models/relay_spec.rb b/spec/models/relay_spec.rb deleted file mode 100644 index 12dc0f20..00000000 --- a/spec/models/relay_spec.rb +++ /dev/null @@ -1,4 +0,0 @@ -require 'rails_helper' - -RSpec.describe Relay, type: :model do -end diff --git a/spec/models/remote_follow_spec.rb b/spec/models/remote_follow_spec.rb deleted file mode 100644 index a5d0e0c5..00000000 --- a/spec/models/remote_follow_spec.rb +++ /dev/null @@ -1,67 +0,0 @@ -# frozen_string_literal: true - -require 'rails_helper' - -RSpec.describe RemoteFollow do - before do - stub_request(:get, 'https://quitter.no/.well-known/webfinger?resource=acct:robcolbert@quitter.no').to_return(request_fixture('webfinger.txt')) - end - - let(:attrs) { nil } - let(:remote_follow) { described_class.new(attrs) } - - describe '.initialize' do - subject { remote_follow.acct } - - context 'attrs with acct' do - let(:attrs) { { acct: 'robcolbert@quitter.no' } } - - it 'returns acct' do - is_expected.to eq 'robcolbert@quitter.no' - end - end - - context 'attrs without acct' do - let(:attrs) { {} } - - it do - is_expected.to be_nil - end - end - end - - describe '#valid?' do - subject { remote_follow.valid? } - - context 'attrs with acct' do - let(:attrs) { { acct: 'robcolbert@quitter.no' } } - - it do - is_expected.to be true - end - end - - context 'attrs without acct' do - let(:attrs) { {} } - - it do - is_expected.to be false - end - end - end - - describe '#subscribe_address_for' do - before do - remote_follow.valid? - end - - let(:attrs) { { acct: 'robcolbert@quitter.no' } } - let(:account) { Fabricate(:account, username: 'alice') } - - subject { remote_follow.subscribe_address_for(account) } - - it 'returns subscribe address' do - is_expected.to eq 'https://quitter.no/main/ostatussub?profile=alice%40cb6e6126.ngrok.io' - end - end -end diff --git a/spec/models/remote_profile_spec.rb b/spec/models/remote_profile_spec.rb deleted file mode 100644 index cbe55105..00000000 --- a/spec/models/remote_profile_spec.rb +++ /dev/null @@ -1,143 +0,0 @@ -# frozen_string_literal: true - -require 'rails_helper' - -RSpec.describe RemoteProfile do - let(:remote_profile) { RemoteProfile.new(body) } - let(:body) do - <<-XML -https://github.com/qbi/WannaCry was sammeln. !security ') } - - it 'parses out URLs' do - expect(a_request(:head, 'https://github.com/qbi/WannaCry')).to have_been_made.at_least_once - end - - it 'ignores URLs to hashtags' do - expect(a_request(:head, 'https://quitter.se/tag/wannacry')).to_not have_been_made - end - end -end diff --git a/spec/services/fetch_oembed_service_spec.rb b/spec/services/fetch_oembed_service_spec.rb deleted file mode 100644 index 5789fb53..00000000 --- a/spec/services/fetch_oembed_service_spec.rb +++ /dev/null @@ -1,143 +0,0 @@ -# frozen_string_literal: true - -require 'rails_helper' - -describe FetchOEmbedService, type: :service do - subject { described_class.new } - - before do - stub_request(:get, "https://host.test/provider.json").to_return(status: 404) - stub_request(:get, "https://host.test/provider.xml").to_return(status: 404) - stub_request(:get, "https://host.test/empty_provider.json").to_return(status: 200) - end - - describe 'discover_provider' do - context 'when status code is 200 and MIME type is text/html' do - context 'Both of JSON and XML provider are discoverable' do - before do - stub_request(:get, 'https://host.test/oembed.html').to_return( - status: 200, - headers: { 'Content-Type': 'text/html' }, - body: request_fixture('oembed_json_xml.html') - ) - end - - it 'returns new OEmbed::Provider for JSON provider if :format option is set to :json' do - subject.call('https://host.test/oembed.html', format: :json) - expect(subject.endpoint_url).to eq 'https://host.test/provider.json' - expect(subject.format).to eq :json - end - - it 'returns new OEmbed::Provider for XML provider if :format option is set to :xml' do - subject.call('https://host.test/oembed.html', format: :xml) - expect(subject.endpoint_url).to eq 'https://host.test/provider.xml' - expect(subject.format).to eq :xml - end - end - - context 'JSON provider is discoverable while XML provider is not' do - before do - stub_request(:get, 'https://host.test/oembed.html').to_return( - status: 200, - headers: { 'Content-Type': 'text/html' }, - body: request_fixture('oembed_json.html') - ) - end - - it 'returns new OEmbed::Provider for JSON provider' do - subject.call('https://host.test/oembed.html') - expect(subject.endpoint_url).to eq 'https://host.test/provider.json' - expect(subject.format).to eq :json - end - end - - context 'XML provider is discoverable while JSON provider is not' do - before do - stub_request(:get, 'https://host.test/oembed.html').to_return( - status: 200, - headers: { 'Content-Type': 'text/html' }, - body: request_fixture('oembed_xml.html') - ) - end - - it 'returns new OEmbed::Provider for XML provider' do - subject.call('https://host.test/oembed.html') - expect(subject.endpoint_url).to eq 'https://host.test/provider.xml' - expect(subject.format).to eq :xml - end - end - - context 'Invalid XML provider is discoverable while JSON provider is not' do - before do - stub_request(:get, 'https://host.test/oembed.html').to_return( - status: 200, - headers: { 'Content-Type': 'text/html' }, - body: request_fixture('oembed_invalid_xml.html') - ) - end - - it 'returns nil' do - expect(subject.call('https://host.test/oembed.html')).to be_nil - end - end - - context 'Neither of JSON and XML provider is discoverable' do - before do - stub_request(:get, 'https://host.test/oembed.html').to_return( - status: 200, - headers: { 'Content-Type': 'text/html' }, - body: request_fixture('oembed_undiscoverable.html') - ) - end - - it 'returns nil' do - expect(subject.call('https://host.test/oembed.html')).to be_nil - end - end - - context 'Empty JSON provider is discoverable' do - before do - stub_request(:get, 'https://host.test/oembed.html').to_return( - status: 200, - headers: { 'Content-Type': 'text/html' }, - body: request_fixture('oembed_json_empty.html') - ) - end - - it 'returns new OEmbed::Provider for JSON provider' do - subject.call('https://host.test/oembed.html') - expect(subject.endpoint_url).to eq 'https://host.test/empty_provider.json' - expect(subject.format).to eq :json - end - end - - end - - context 'when status code is not 200' do - before do - stub_request(:get, 'https://host.test/oembed.html').to_return( - status: 400, - headers: { 'Content-Type': 'text/html' }, - body: request_fixture('oembed_xml.html') - ) - end - - it 'returns nil' do - expect(subject.call('https://host.test/oembed.html')).to be_nil - end - end - - context 'when MIME type is not text/html' do - before do - stub_request(:get, 'https://host.test/oembed.html').to_return( - status: 200, - body: request_fixture('oembed_xml.html') - ) - end - - it 'returns nil' do - expect(subject.call('https://host.test/oembed.html')).to be_nil - end - end - end -end diff --git a/spec/services/fetch_remote_account_service_spec.rb b/spec/services/fetch_remote_account_service_spec.rb deleted file mode 100644 index afc76379..00000000 --- a/spec/services/fetch_remote_account_service_spec.rb +++ /dev/null @@ -1,89 +0,0 @@ -require 'rails_helper' - -RSpec.describe FetchRemoteAccountService, type: :service do - let(:url) { 'https://example.com/alice' } - let(:prefetched_body) { nil } - let(:protocol) { :ostatus } - subject { FetchRemoteAccountService.new.call(url, prefetched_body, protocol) } - - let(:actor) do - { - '@context': 'https://www.w3.org/ns/activitystreams', - id: 'https://example.com/alice', - type: 'Person', - preferredUsername: 'alice', - name: 'Alice', - summary: 'Foo bar', - inbox: 'http://example.com/alice/inbox', - } - end - - let(:webfinger) { { subject: 'acct:alice@example.com', links: [{ rel: 'self', href: 'https://example.com/alice' }] } } - let(:xml) { File.read(Rails.root.join('spec', 'fixtures', 'xml', 'gabsocial.atom')) } - - shared_examples 'return Account' do - it { is_expected.to be_an Account } - end - - context 'protocol is :activitypub' do - let(:prefetched_body) { Oj.dump(actor) } - let(:protocol) { :activitypub } - - before do - stub_request(:get, 'https://example.com/.well-known/webfinger?resource=acct:alice@example.com').to_return(body: Oj.dump(webfinger), headers: { 'Content-Type': 'application/jrd+json' }) - end - - include_examples 'return Account' - end - - context 'protocol is :ostatus' do - let(:prefetched_body) { xml } - let(:protocol) { :ostatus } - - before do - stub_request(:get, "https://kickass.zone/.well-known/webfinger?resource=acct:localhost@kickass.zone").to_return(request_fixture('webfinger-hacker3.txt')) - stub_request(:get, "https://kickass.zone/api/statuses/user_timeline/7477.atom").to_return(request_fixture('feed.txt')) - end - - include_examples 'return Account' - - it 'does not update account information if XML comes from an unverified domain' do - feed_xml = <<-XML.squish - -