Skip to content

[REGRESSION] Avatars doesn't show up on older servers (< 3.6.0) #2603

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
diegolmello merged 3 commits into from
Nov 3, 2020
Merged

[REGRESSION] Avatars doesn't show up on older servers (< 3.6.0) #2603

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9e8cabe
[REGRESSION] Avatars doesn't show up on older servers (< 3.6.0)
djorkaeffalexandre Nov 3, 2020
3797656
fix: snapshots tests failing
djorkaeffalexandre Nov 3, 2020
299fa14
Merge branch 'develop' into fix.avatar-on-older-servers
diegolmello Nov 3, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 8 additions & 1 deletion app/utils/avatar.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,19 @@
import semver from 'semver';

import reduxStore from '../lib/createStore';

const formatUrl = (url, size, query) => `${ url }?format=png&size=${ size }${ query }`;

export const avatarURL = ({
type, text, size, user = {}, avatar, server, avatarETag, rid, blockUnauthenticatedAccess
}) => {
const { version: serverVersion } = reduxStore.getState().server;
const isLegacy = serverVersion && semver.lt(semver.coerce(serverVersion), '3.6.0');

let room;
if (type === 'd') {
room = text;
} else if (rid) {
} else if (rid && !isLegacy) {
room = `room/${ rid }`;
} else {
room = `@${ text }`;
Expand Down
2 changes: 2 additions & 0 deletions storybook/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@ import 'react-native-gesture-handler';

// eslint-disable-next-line no-undef
jest.mock('../app/lib/database', () => jest.fn(() => null)); // comment this line to make storybook work
// eslint-disable-next-line no-undef
jest.mock('../app/lib/createStore', () => ({ getState: () => ({ server: {} }) })); // comment this line to make storybook work

RNBootSplash.hide();

Expand Down