7c9c45ac5f
* split component prepare new views / states
* extract empty and disabled state as components
* fix empty state mail icon
* first logic switching between modes, move page to /private-messages/index.vue
* extract autoCompleteHelper.js
* style header + start new message input
* style plus button + focus input
* state logic, types for sanity
* WIP PM new Message started
* add /members/username test
* first design changes to messageCard
* delete private message or chat - based on the mode
* copy as todo
* mention links to modal
* report chat or private message
* WIP likeButton
* likeButton styling
* hide like on private message cards
* fix unit test
* replace copy as todo - to just a copy to clipboard
* style changes
* menu position + like button width
* dropdown items background + like font
* fix like button padding
* move api endpoints and tests around to group inbox methods + like for inbox private messages
* restyle system messages
* Dropdown Radius and Padding
* WIP system messages
* fix lint
* copy delta commit of allowing liking own private messages
* enable liking private messages
* fix menu non hovered item icon color
* fix import path
* ignore background on system messages
* requested changes + migration
* update migration to update the unique id to some messages and delete the duplicates
* migration based on users pagination
* fix(migration): use Promise.all
* change to bulkWrites per User, and all messages in one run (of a user)
* check for array
* use rest operator ...
* skip sorting to get the users
* remove migration, disable like for private messages without uniqueMessageId
* lean+bulkWrite for likes, add time checks for like and auth for further debugging
* add a limit 2 get the messages by uniqueId
* Adding a simple server start script
* remove pinned nodemon dep
* fix inbox controller/tests
* fix / requested style changes
* fix empty state padding /
* hide avatar weapons on messages - fix avatar spacing on messages
* Hourglass Simplification (#15323)
* begin removing obsolete tests
* begin refactoring
* update cron tests
* cleanup
* finish basic implementation of new logic
* add more subscription tests
* subscription test improvements
* return nextHourglassDate again
* fix gem limit
* fix(test): short circuit this.
* fix(admin): correct logic and style for shrimple subs
* WIP(frontend): draft of main subs page view
* fix hourglass count
* Fix hourglass logic for upgrades
* fix admin panel display
* WIP(subs): extant Stripe state
* fix admin panel strings
* fix missing transaction type
* add new field for cumulative subscription count
* show date for hourglass bonus if it was received
* fix test
* feat(subscription): max Gems progress readout
* fix(css): correct and refactor heights and selection states
* fix(subs): correct border-radius and redirect
* fix(stripe): correct redirect after success
* Admin panel display fixes
* don’t give additional HG for new sub if they already got one this month
* fix issue with promo hourglasses
* fix(subscription): update layout when gifting
* fix(subscriptions): more gift layout revisions
* fix(subscriptions): minor visual updates
* fix(subs): pass autoRenews through Stripe
* fix(subs): gifts DON't renew
* fix(lint): unnecessary ternary
* fix(lint): do negate object ig
* fix(subs): try again on gifts
* fix(subs): unhovery and un-12-monthy
* fix bug with incorrectly giving HG bonus
* remove only
* fix test
* fix test
* fix(subs): also redirect to subs after gift sub
* fix(subs): fix typeError
* fix(g1g1): don't try to find Gems promo during bogo
---------
Co-authored-by: Phillip Thelen <phillip@habitica.com>
Co-authored-by: Kalista Payne <sabe@habitica.com>
* chore(sprites): update subproject
* fix(layout): tighten cancellation note
* fix(subs): Google wording and HG escape
* chore(testing): fake g1g1 dates
* fix(subs): don't hide HG preview entirely
* fix(subs): center next hourglass message
* working validatedTextInput.vue within start-new-conversation-input-header.vue 🎉
* fix(git): remove changes from old develop
* Revert "fix(git): remove changes from old develop"
This reverts commit 0e30f7df00.
* fix(git): no actually just this file i guesss
* adding an empty loading state, hiding
* fought the avatar arch nemesis again
* fix chatMessages (party chat) message spacing
* move disabled text back to above the input area - re-enable input area
* show disabled private messages top panel
* fix font color
* fixing uiStates - removing disabled - moving the own user check to the last
* fix(lint): add missing prop defaults
* fix(lint): object default should be fn
* fix(chat): correct grammar in error
* remove weapon position relative
* revert most of avatar.vue changes, add back weapons in chat message UI
* show date tooltip above system / skill messages
* fix toggle disable icon position
* trivial CSS cleanup
* fix(typo): English syntax in test
* chore(test): small style cleanup
* chore(logging): revert debug function
* chore(debug): remove timers from inbox like
---------
Co-authored-by: SabreCat <sabe@habitica.com>
Co-authored-by: Kalista Payne <sabrecat@gmail.com>
Co-authored-by: Phillip Thelen <phillip@habitica.com>
319 lines
8.3 KiB
Vue
319 lines
8.3 KiB
Vue
<template>
|
|
<div
|
|
ref="container"
|
|
class="container-fluid"
|
|
>
|
|
<div class="row loadmore">
|
|
<div v-if="canLoadMore">
|
|
<div class="loadmore-divider"></div>
|
|
<button
|
|
class="btn btn-secondary"
|
|
@click="triggerLoad()"
|
|
>
|
|
{{ $t('loadEarlierMessages') }}
|
|
</button>
|
|
<div class="loadmore-divider"></div>
|
|
</div>
|
|
<h2
|
|
v-show="isLoading"
|
|
class="col-12 loading"
|
|
>
|
|
{{ $t('loading') }}
|
|
</h2>
|
|
</div>
|
|
<div
|
|
v-for="msg in messages.filter(m => chat && canViewFlag(m))"
|
|
:key="msg.id"
|
|
class="message-row"
|
|
:class="{ 'margin-right': user._id !== msg.uuid}"
|
|
>
|
|
<div class="d-flex">
|
|
<avatar
|
|
v-if="user._id !== msg.uuid && msg.uuid !== 'system'"
|
|
class="avatar-left"
|
|
:class="{ invisible: avatarUnavailable(msg) }"
|
|
:member="msg.userStyles || cachedProfileData[msg.uuid] || {}"
|
|
:avatar-only="true"
|
|
:hide-class-badge="true"
|
|
:override-top-padding="'14px'"
|
|
@click.native="showMemberModal(msg.uuid)"
|
|
/>
|
|
<message-card
|
|
:msg="msg"
|
|
:group-id="groupId"
|
|
:user-sent-message="user._id === msg.uuid"
|
|
@message-liked="messageLiked"
|
|
@message-removed="messageRemoved"
|
|
@message-card-mounted="itemWasMounted"
|
|
/>
|
|
<avatar
|
|
v-if="user._id === msg.uuid"
|
|
:class="{ invisible: avatarUnavailable(msg) }"
|
|
:member="msg.userStyles || cachedProfileData[msg.uuid] || {}"
|
|
:avatar-only="true"
|
|
:hide-class-badge="true"
|
|
:override-top-padding="'14px'"
|
|
@click.native="showMemberModal(msg.uuid)"
|
|
/>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
</template>
|
|
|
|
<style lang="scss" scoped>
|
|
@import '~@/assets/scss/colors.scss';
|
|
|
|
.avatar {
|
|
width: 10%;
|
|
min-width: 7rem;
|
|
}
|
|
.loadmore {
|
|
justify-content: center;
|
|
|
|
> div {
|
|
display: flex;
|
|
width: 100%;
|
|
align-items: center;
|
|
|
|
button {
|
|
text-align: center;
|
|
color: $gray-50;
|
|
margin-top: 12px;
|
|
margin-bottom: 24px;
|
|
}
|
|
}
|
|
}
|
|
|
|
.loadmore-divider {
|
|
height: 1px;
|
|
background-color: $gray-500;
|
|
flex: 1;
|
|
margin-left: 24px;
|
|
margin-right: 24px;
|
|
|
|
&:last-of-type {
|
|
margin-right: 0;
|
|
}
|
|
}
|
|
|
|
.hr {
|
|
width: 100%;
|
|
height: 20px;
|
|
border-bottom: 1px solid $gray-500;
|
|
text-align: center;
|
|
margin: 2em 0;
|
|
}
|
|
|
|
.hr-middle {
|
|
font-size: 16px;
|
|
font-weight: bold;
|
|
font-family: 'Roboto Condensed';
|
|
line-height: 1.5;
|
|
text-align: center;
|
|
color: $gray-200;
|
|
background-color: $gray-700;
|
|
padding: .2em;
|
|
margin-top: .2em;
|
|
display: inline-block;
|
|
width: 100px;
|
|
}
|
|
|
|
.card {
|
|
border: 0px;
|
|
margin-bottom: .5em;
|
|
padding: 0rem;
|
|
width: 90%;
|
|
|
|
&.system-message {
|
|
width: 100%;
|
|
}
|
|
}
|
|
|
|
.message-scroll .d-flex {
|
|
min-width: 1px;
|
|
}
|
|
|
|
.message-row {
|
|
margin-left: 12px;
|
|
margin-right: 0;
|
|
margin-bottom: 1.2rem;
|
|
|
|
&:not(.margin-right) {
|
|
.d-flex {
|
|
justify-content: flex-end;
|
|
}
|
|
}
|
|
}
|
|
</style>
|
|
|
|
<script>
|
|
import moment from 'moment';
|
|
import axios from 'axios';
|
|
import debounce from 'lodash/debounce';
|
|
import findIndex from 'lodash/findIndex';
|
|
import { userStateMixin } from '../../mixins/userState';
|
|
|
|
import Avatar from '../avatar';
|
|
import MessageCard from '@/components/messages/messageCard.vue';
|
|
|
|
// TODO merge chatMessages.vue (party message list) with messageList.vue (private message list)
|
|
|
|
export default {
|
|
components: {
|
|
MessageCard,
|
|
Avatar,
|
|
},
|
|
mixins: [userStateMixin],
|
|
props: {
|
|
chat: {},
|
|
groupType: {},
|
|
groupId: {},
|
|
groupName: {},
|
|
|
|
isLoading: Boolean,
|
|
canLoadMore: Boolean,
|
|
},
|
|
data () {
|
|
return {
|
|
currentDayDividerDisplay: moment().day(),
|
|
cachedProfileData: {},
|
|
currentProfileLoadedCount: 0,
|
|
currentProfileLoadedEnd: 10,
|
|
loading: false,
|
|
handleScrollBack: false,
|
|
lastOffset: -1,
|
|
};
|
|
},
|
|
computed: {
|
|
// @TODO: We need a different lazy load mechnism.
|
|
// But honestly, adding a paging route to chat would solve this
|
|
messages () {
|
|
this.loadProfileCache();
|
|
return this.chat;
|
|
},
|
|
},
|
|
mounted () {
|
|
this.loadProfileCache();
|
|
},
|
|
created () {
|
|
window.addEventListener('scroll', this.handleScroll);
|
|
},
|
|
beforeDestroy () {
|
|
window.removeEventListener('scroll', this.handleScroll);
|
|
},
|
|
methods: {
|
|
handleScroll () {
|
|
this.loadProfileCache(window.scrollY / 1000);
|
|
},
|
|
async triggerLoad () {
|
|
const { container } = this.$refs;
|
|
|
|
// get current offset
|
|
this.lastOffset = container.scrollTop - (container.scrollHeight - container.clientHeight);
|
|
// disable scroll
|
|
container.style.overflowY = 'hidden';
|
|
},
|
|
canViewFlag (message) {
|
|
if (message.uuid === this.user._id) return true;
|
|
if (!message.flagCount || message.flagCount < 2) return true;
|
|
return this.hasPermission(this.user, 'moderator');
|
|
},
|
|
loadProfileCache: debounce(function loadProfileCache (screenPosition) {
|
|
this._loadProfileCache(screenPosition);
|
|
}, 1000),
|
|
async _loadProfileCache (screenPosition) {
|
|
if (this.loading) return;
|
|
this.loading = true;
|
|
|
|
const promises = [];
|
|
const noProfilesLoaded = Object.keys(this.cachedProfileData).length === 0;
|
|
|
|
// @TODO: write an explanation
|
|
// @TODO: Remove this after enough messages are cached
|
|
if (
|
|
!noProfilesLoaded
|
|
&& screenPosition && Math.floor(screenPosition) + 1 > this.currentProfileLoadedEnd / 10
|
|
) {
|
|
this.currentProfileLoadedEnd = 10 * (Math.floor(screenPosition) + 1);
|
|
} else if (!noProfilesLoaded && screenPosition) {
|
|
return;
|
|
}
|
|
|
|
const aboutToCache = {};
|
|
this.messages.forEach(message => {
|
|
const { uuid } = message;
|
|
|
|
if (message.userStyles) {
|
|
this.$set(this.cachedProfileData, uuid, message.userStyles);
|
|
}
|
|
|
|
if (Boolean(uuid) && !this.cachedProfileData[uuid] && !aboutToCache[uuid]) {
|
|
if (uuid === 'system' || this.currentProfileLoadedCount === this.currentProfileLoadedEnd) return;
|
|
aboutToCache[uuid] = {};
|
|
promises.push(axios.get(`/api/v4/members/${uuid}`));
|
|
this.currentProfileLoadedCount += 1;
|
|
}
|
|
});
|
|
|
|
const results = await Promise.all(promises);
|
|
results.forEach(result => {
|
|
// We could not load the user. Maybe they were deleted.
|
|
// So, let's cache empty so we don't try again
|
|
if (!result || !result.data || result.status >= 400) {
|
|
return;
|
|
}
|
|
|
|
const userData = result.data.data;
|
|
this.$set(this.cachedProfileData, userData._id, userData);
|
|
});
|
|
|
|
// Merge in any attempts that were rejected so we don't attempt again
|
|
for (const uuid in aboutToCache) {
|
|
if (!this.cachedProfileData[uuid]) {
|
|
this.$set(this.cachedProfileData, uuid, { rejected: true });
|
|
}
|
|
}
|
|
|
|
this.loading = false;
|
|
},
|
|
avatarUnavailable ({ userStyles, uuid }) {
|
|
const { cachedProfileData } = this;
|
|
return (!userStyles && (!cachedProfileData[uuid] || cachedProfileData[uuid].rejected));
|
|
},
|
|
displayDivider (message) {
|
|
if (this.currentDayDividerDisplay !== moment(message.timestamp).day()) {
|
|
this.currentDayDividerDisplay = moment(message.timestamp).day();
|
|
return true;
|
|
}
|
|
|
|
return false;
|
|
},
|
|
async showMemberModal (memberId) {
|
|
this.$router.push({ name: 'userProfile', params: { userId: memberId } });
|
|
},
|
|
itemWasMounted: debounce(function itemWasMounted () {
|
|
if (this.handleScrollBack) {
|
|
this.handleScrollBack = false;
|
|
|
|
const { container } = this.$refs;
|
|
const offset = container.scrollHeight - container.clientHeight;
|
|
|
|
const newOffset = offset + this.lastOffset;
|
|
|
|
container.scrollTo(0, newOffset);
|
|
// enable scroll again
|
|
container.style.overflowY = 'scroll';
|
|
}
|
|
}, 50),
|
|
messageLiked (message) {
|
|
const chatIndex = findIndex(this.chat, chatMessage => chatMessage.id === message.id);
|
|
this.chat.splice(chatIndex, 1, message);
|
|
},
|
|
messageRemoved (message) {
|
|
const chatIndex = findIndex(this.chat, chatMessage => chatMessage.id === message.id);
|
|
this.chat.splice(chatIndex, 1);
|
|
},
|
|
},
|
|
};
|
|
</script>
|