Skip to content
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.

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

Update ttl outstream #6253

Merged
merged 57 commits into from
Feb 16, 2021
Merged
Changes from all commits
Commits
Show all changes
57 commits
Select commit Hold shift + click to select a range
5711b57
adding DMX
Nov 17, 2016
ad33b56
Update districtm_spec.js
stevealliance Nov 30, 2016
fbd31ff
Update districtmDMX.js
stevealliance Nov 30, 2016
fe94313
updating repo fork in github
Oct 26, 2017
6054a04
Merge pull request #1 from prebid/master
stevealliance Jun 22, 2018
0384c75
adding all districtm needed file
Jun 22, 2018
d2f5de2
remove legacy file
Jun 22, 2018
d83db11
remove typo || 0 in the test method
Jun 22, 2018
a7d0a85
force default to return a valid width and height
Jun 27, 2018
d73cac7
update unit test code for failing test
Jun 27, 2018
d5b2617
changed class for an object
Jul 9, 2018
c80b0df
remove package-lock.json
Jul 9, 2018
afa5d3e
change file name for dmx adapter
Jul 11, 2018
4e93b06
remove package-lock.json
Jul 11, 2018
afdbd9e
update fork
Jul 31, 2018
5cc3181
renamed files
Jul 31, 2018
e3e864d
restaure package-lock.json
Jul 31, 2018
6af65f9
update to last package-lock state
Jul 31, 2018
4da8f60
Merge branch 'master' of https://github.com/prebid/Prebid.js
Aug 14, 2018
15954f2
Merge branch 'master' of https://github.com/prebid/Prebid.js
Aug 27, 2018
af73067
update gdpr user consent
Aug 27, 2018
c2e2f5f
fix sizes issue
Aug 27, 2018
0f83dab
Documentation updates
lsv1 Aug 29, 2018
787e1e0
Merge pull request #3 from lsv1/patch-1
stevealliance Aug 29, 2018
a63b92b
Merge branch 'master' of https://github.com/prebid/Prebid.js
Sep 4, 2018
3dfb282
update file name and update unit testing import file location
Sep 4, 2018
5786375
Merge branch 'master' of https://github.com/stevealliance/Prebid.js
Sep 4, 2018
60f693e
update remote to reflect forked repo
Jun 17, 2019
1f03347
Mdding all file to localserge branch 'master' of github.com:prebid/Pr…
Oct 23, 2019
a3d85d7
current machine state
Oct 23, 2019
a327932
lint correction
Oct 23, 2019
1706bd1
remove variable assigment duplicate
Oct 23, 2019
9492b32
adding change to dmx
steve-a-districtm Nov 6, 2019
5660324
Merge pull request #4 from prebid/master
stevealliance Dec 9, 2019
f006e29
adding CCPA support for DMX
steve-a-districtm Dec 9, 2019
c6b689b
adding test for ccpa and gdpr
steve-a-districtm Dec 13, 2019
c57fc3b
districtm dmx adding deal id field
stevealliance Jan 21, 2020
f31582b
idsync support ccpa & gdpr
steve-a-districtm Feb 17, 2020
774dd31
Merge pull request #5 from prebid/master
stevealliance Mar 18, 2020
1487845
merge remote-tracking branch 'upstream/master'
steve-a-districtm Apr 23, 2020
3836393
Merge remote-tracking branch 'upstream/master'
stevealliance Aug 4, 2020
69a4310
Merge branch 'master' of https://github.com/prebid/Prebid.js
stevealliance Oct 6, 2020
c930a32
Merge branch 'master' of https://github.com/prebid/Prebid.js
stevealliance Oct 29, 2020
4cd7362
Merge branch 'master' of https://github.com/prebid/Prebid.js
stevealliance Nov 19, 2020
ffa6717
merge forked
Feb 1, 2021
a359131
update forked
Feb 1, 2021
1bcd46b
stop mediatype changing ttl
Feb 1, 2021
219f139
remove lint error
Feb 2, 2021
5584441
adding gvlid for dmx
Feb 2, 2021
e4bbbe5
removing change
stevealliance Feb 9, 2021
6073e0d
update file
stevealliance Feb 9, 2021
e6369a4
Revert "removing change"
stevealliance Feb 11, 2021
bba2852
adding aliases base on ticket #6294
stevealliance Feb 11, 2021
27a50a4
update file
stevealliance Feb 9, 2021
d80afa1
fix error for issue #6294
stevealliance Feb 11, 2021
32612e9
Merge branch 'update-ttl-outstream' of https://github.com/steveallian…
stevealliance Feb 11, 2021
7e805d8
file removal from PR
stevealliance Feb 11, 2021
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
5 changes: 4 additions & 1 deletion modules/districtmDMXBidAdapter.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ const BIDDER_CODE = 'districtmDMX';

const DMXURI = 'https://dmx.districtm.io/b/v1';

const GVLID = 144;
const VIDEO_MAPPING = {
playback_method: {
'auto_play_sound_on': 1,
Expand All @@ -19,6 +20,8 @@ const VIDEO_MAPPING = {
};
export const spec = {
code: BIDDER_CODE,
gvlid: GVLID,
aliases: ['dmx'],
supportedFormat: [BANNER, VIDEO],
supportedMediaTypes: [VIDEO, BANNER],
isBidRequestValid(bid) {
Expand All @@ -41,7 +44,7 @@ export const spec = {
nBid.height = nBid.h || height;
nBid.ttl = 300;
nBid.mediaType = bid.mediaTypes && bid.mediaTypes.video ? 'video' : 'banner';
if (nBid.mediaType) {
if (nBid.mediaType === 'video') {
nBid.vastXml = cleanVast(nBid.adm, nBid.nurl);
nBid.ttl = 3600;
}
Expand Down