1
0
Fork 0
mirror of https://github.com/FrankerFaceZ/FrankerFaceZ.git synced 2025-08-30 01:40:55 +00:00

4.0.0-rc5.3

* Fixed: Twitch emotes not displaying in Whispers.
* Fixed: Alignment of in-line actions when using Emote Alignment: Padded.
* Changed: Display the git commit hash for the current build in the FFZ Control Center, rather than the webpack build hash.
This commit is contained in:
SirStendec 2018-07-16 13:57:56 -04:00
parent aab1177d1f
commit c139de9d60
8 changed files with 31 additions and 7 deletions

View file

@ -100,7 +100,8 @@ class FrankerFaceZ extends Module {
FrankerFaceZ.Logger = Logger;
const VER = FrankerFaceZ.version_info = {
major: 4, minor: 0, revision: 0, extra: '-rc5.2',
major: 4, minor: 0, revision: 0, extra: '-rc5.3',
commit: __git_commit__,
build: __webpack_hash__,
toString: () =>
`${VER.major}.${VER.minor}.${VER.revision}${VER.extra || ''}${DEBUG ? '-dev' : ''}`

View file

@ -252,7 +252,7 @@ export default class Actions extends Module {
});
return (<div
class="ffz--inline-actions ffz-action-data tw-inline tw-mg-r-05"
class="ffz--inline-actions ffz-action-data tw-inline-block tw-mg-r-05"
data-msg-id={msg.id}
data-user={user}
data-room={room}

View file

@ -586,7 +586,7 @@ export default class Chat extends Module {
user: msg.from,
message: msg.content.slice(offset),
is_action,
emotes,
ffz_emotes: emotes,
timestamp: msg.sentAt && msg.sentAt.getTime(),
deleted: false
};

View file

@ -74,7 +74,18 @@
{{ t('main-menu.version', 'Version %{version}', {version: version.toString()}) }}
</div>
<div class="tw-c-text-alt-2">
{{ version.build }}
<a
v-if="version.commit"
:href="`https://www.github.com/FrankerFaceZ/FrankerFaceZ/commit/${version.commit}`"
class="tw-link tw-link--inherit"
target="_blank"
rel="noopener noreferrer"
>
{{ version.commit.slice(0,7) }}
</a>
<span v-else>
{{ version.build }}
</span>
</div>
</footer>
</nav>

View file

@ -277,6 +277,7 @@ export default class RavenLogger extends Module {
out = {};
out.build = __webpack_hash__;
out.git_commit = __git_commit__;
if ( core )
out.twitch_build = core.config.buildID;

View file

@ -223,8 +223,7 @@ export default class ChatLine extends Module {
props.showTimestamps !== this.props.showTimestamps;
}
cls.prototype.render = function() {
try {
cls.prototype.render = function() { try {
const types = t.parent.message_types || {},